Skip to content

nvx-rs: build the NVXS unit tests' epoch identities with one function #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pedro Henrique Penna (ppenna) merged 1 commit into from
Oct 21, 2026
Merged

nvx-rs: build the NVXS unit tests' epoch identities with one function #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions nvx-rs/src/protocol/nvxs/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ const NONE: Identity = Identity {
epoch: 0,
};

/// Returns the identity of `epoch` of the sessions' instance, such as an epoch that a RESET
/// starts, or epoch 0, which no session has.
fn epoch(epoch: u64) -> Identity {
Identity { epoch, ..IDENTITY }
}

fn hex(bytes: &[u8]) -> String {
bytes.iter().map(|byte| format!("{byte:02x}")).collect()
}
Expand Down Expand Up @@ -127,17 +133,13 @@ fn feed<T>(
/// The broker's records to a host that attaches after waiting, receives three DATA records, and
/// is reset: payloads of 1, 21, and 300 bytes, one of them with the magic inside.
fn host_stream() -> Vec<u8> {
let next = Identity {
epoch: 2,
..IDENTITY
};
[
record(RecordType::Wait, IDENTITY, 0, &[]),
record(RecordType::Ready, IDENTITY, 1, &[]),
record(RecordType::Data, IDENTITY, 2, b"x"),
record(RecordType::Data, IDENTITY, 3, b"NVXS inside a payload"),
record(RecordType::Data, IDENTITY, 4, &[0x5a; 300]),
record(RecordType::Reset, next, 5, &[]),
record(RecordType::Reset, epoch(2), 5, &[]),
]
.concat()
}
Expand Down
40 changes: 6 additions & 34 deletions nvx-rs/src/protocol/nvxs/tests/guest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,7 @@ fn the_guest_checks_the_identity_of_each_reset() {
instance_id: [0; 16],
epoch: 1,
},
Identity {
instance_id: INSTANCE,
epoch: 0,
},
epoch(0),
] {
let mut guest = attaching_guest();
let reset = record(RecordType::Reset, identity, 0, &[]);
Expand All @@ -163,23 +160,12 @@ fn the_guest_checks_the_identity_of_each_reset() {
let reset = record(RecordType::Reset, IDENTITY, 1, &[]);
assert_eq!(guest.receive(&reset), Err(expected));
let mut guest = active_guest(OUTER_RECEIVE_WINDOW);
let later = Identity {
epoch: 9,
..IDENTITY
};
let later = epoch(9);
let reset = record(RecordType::Reset, later, 0, &[]);
let event = Some(GuestEvent::Reset(later));
assert_eq!(guest.receive(&reset), Ok((reset.len(), event)));
let mut stale = guest.clone();
let earlier = record(
RecordType::Reset,
Identity {
epoch: 8,
..IDENTITY
},
1,
&[],
);
let earlier = record(RecordType::Reset, epoch(8), 1, &[]);
let expected = SessionError::StaleEpoch {
current: 9,
actual: 8,
Expand Down Expand Up @@ -246,15 +232,7 @@ fn the_guest_checks_the_sequence_and_identity_of_data() {
},
),
(
record(
RecordType::Data,
Identity {
epoch: 2,
..IDENTITY
},
1,
b"x",
),
record(RecordType::Data, epoch(2), 1, b"x"),
SessionError::Epoch {
expected: 1,
actual: 2,
Expand Down Expand Up @@ -393,10 +371,7 @@ fn a_reset_in_the_middle_of_a_message_abandons_it() {

// The broker resets the session before the rest arrives, so the application abandons the
// message, and the outstanding bytes of the old epoch need no credit.
let next = Identity {
epoch: 2,
..IDENTITY
};
let next = epoch(2);
let reset = record(RecordType::Reset, next, 0, &[]);
let event = Some(GuestEvent::Reset(next));
assert_eq!(guest.receive(&reset), Ok((reset.len(), event)));
Expand Down Expand Up @@ -470,10 +445,7 @@ fn the_guest_session_closes_only_at_a_record_boundary() {

#[test]
fn the_guest_reports_the_same_events_for_every_split_of_its_stream() {
let next = Identity {
epoch: 2,
..IDENTITY
};
let next = epoch(2);
let stream = [
record(RecordType::Reset, IDENTITY, 0, &[]),
record(RecordType::Data, IDENTITY, 1, b"x"),
Expand Down
61 changes: 8 additions & 53 deletions nvx-rs/src/protocol/nvxs/tests/host.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,11 @@ fn the_host_checks_the_brokers_sequence_numbers() {
);

// DATA and RESET out of sequence after READY at 0.
let next = Identity {
epoch: 2,
..IDENTITY
};
for (encoded, actual) in [
(record(RecordType::Data, IDENTITY, 0, b"x"), 0),
(record(RecordType::Data, IDENTITY, 2, b"x"), 2),
(record(RecordType::Data, IDENTITY, u64::MAX, b"x"), u64::MAX),
(record(RecordType::Reset, next, 0, &[]), 0),
(record(RecordType::Reset, epoch(2), 0, &[]), 0),
] {
let mut host = attached_host();
let expected = SessionError::Sequence {
Expand Down Expand Up @@ -217,10 +213,7 @@ fn the_host_checks_the_sessions_identity() {
instance_id: [0; 16],
epoch: 1,
},
Identity {
instance_id: INSTANCE,
epoch: 0,
},
epoch(0),
] {
let mut host = attaching_host();
let ready = record(RecordType::Ready, identity, 0, &[]);
Expand All @@ -244,30 +237,14 @@ fn the_host_checks_the_sessions_identity() {
instance_error.clone(),
),
(
record(
RecordType::Data,
Identity {
epoch: 2,
..IDENTITY
},
1,
b"x",
),
record(RecordType::Data, epoch(2), 1, b"x"),
SessionError::Epoch {
expected: 1,
actual: 2,
},
),
(
record(
RecordType::Data,
Identity {
epoch: 0,
..IDENTITY
},
1,
b"x",
),
record(RecordType::Data, epoch(0), 1, b"x"),
SessionError::Epoch {
expected: 1,
actual: 0,
Expand All @@ -285,15 +262,7 @@ fn the_host_checks_the_sessions_identity() {
},
),
(
record(
RecordType::Reset,
Identity {
epoch: 0,
..IDENTITY
},
1,
&[],
),
record(RecordType::Reset, epoch(0), 1, &[]),
SessionError::MissingIdentity(RecordType::Reset),
),
];
Expand All @@ -304,19 +273,8 @@ fn the_host_checks_the_sessions_identity() {
}

// A reset never moves an instance's epoch back.
let mut host = attached_host_at(Identity {
epoch: 3,
..IDENTITY
});
let reset = record(
RecordType::Reset,
Identity {
epoch: 2,
..IDENTITY
},
1,
&[],
);
let mut host = attached_host_at(epoch(3));
let reset = record(RecordType::Reset, epoch(2), 1, &[]);
let expected = SessionError::StaleEpoch {
current: 3,
actual: 2,
Expand All @@ -327,10 +285,7 @@ fn the_host_checks_the_sessions_identity() {
#[test]
fn a_reset_ends_the_hosts_attachment() {
let mut host = attached_host();
let next = Identity {
epoch: 2,
..IDENTITY
};
let next = epoch(2);
let stream = [
record(RecordType::Data, IDENTITY, 1, b"x"),
record(RecordType::Reset, next, 2, &[]),
Expand Down
Loading