style: cargo fmt --all
This commit is contained in:
+21
-13
@@ -402,11 +402,7 @@ fn select_addressed<S: Store, A: PartialEq>(
|
|||||||
/// Returns `true` when `(id, addr)` has been recorded in the bounce table —
|
/// Returns `true` when `(id, addr)` has been recorded in the bounce table —
|
||||||
/// i.e. `id` was received from, or forwarded to, `addr`. A message addressed to
|
/// i.e. `id` was received from, or forwarded to, `addr`. A message addressed to
|
||||||
/// such a peer would just bounce back, so it is skipped.
|
/// such a peer would just bounce back, so it is skipped.
|
||||||
fn is_sourced<A: PartialEq>(
|
fn is_sourced<A: PartialEq>(bounce: &[(ObservationId, A)], id: ObservationId, addr: &A) -> bool {
|
||||||
bounce: &[(ObservationId, A)],
|
|
||||||
id: ObservationId,
|
|
||||||
addr: &A,
|
|
||||||
) -> bool {
|
|
||||||
for &(bid, ref baddr) in bounce {
|
for &(bid, ref baddr) in bounce {
|
||||||
if bid == id && baddr == addr {
|
if bid == id && baddr == addr {
|
||||||
return true;
|
return true;
|
||||||
@@ -929,13 +925,20 @@ mod tests {
|
|||||||
o.to = Some(ME);
|
o.to = Some(ME);
|
||||||
o.lifetime_ms = Some(100);
|
o.lifetime_ms = Some(100);
|
||||||
o.age_ms = 200;
|
o.age_ms = 200;
|
||||||
let frame = Frame::Obs { from: [2; 16], obs: o.clone() };
|
let frame = Frame::Obs {
|
||||||
|
from: [2; 16],
|
||||||
|
obs: o.clone(),
|
||||||
|
};
|
||||||
assert!(
|
assert!(
|
||||||
ex.on_event(Event::Frame(1, frame_bytes(&frame)), &mut store, 0)
|
ex.on_event(Event::Frame(1, frame_bytes(&frame)), &mut store, 0)
|
||||||
.is_none(),
|
.is_none(),
|
||||||
"an expired addressed obs must not be delivered"
|
"an expired addressed obs must not be delivered"
|
||||||
);
|
);
|
||||||
assert_eq!(store.len(), 0, "an expired addressed obs must not be stored");
|
assert_eq!(
|
||||||
|
store.len(),
|
||||||
|
0,
|
||||||
|
"an expired addressed obs must not be stored"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -972,11 +975,13 @@ mod tests {
|
|||||||
let mut o = obs([2; 16], 7, 0, None, b"t", b"hi");
|
let mut o = obs([2; 16], 7, 0, None, b"t", b"hi");
|
||||||
o.to = Some(ME);
|
o.to = Some(ME);
|
||||||
o.lifetime_ms = None;
|
o.lifetime_ms = None;
|
||||||
let frame = Frame::Obs { from: [2; 16], obs: o.clone() };
|
let frame = Frame::Obs {
|
||||||
assert!(
|
from: [2; 16],
|
||||||
ex.on_event(Event::Frame(1, frame_bytes(&frame)), &mut store, 0)
|
obs: o.clone(),
|
||||||
.is_none()
|
};
|
||||||
);
|
assert!(ex
|
||||||
|
.on_event(Event::Frame(1, frame_bytes(&frame)), &mut store, 0)
|
||||||
|
.is_none());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
store.len(),
|
store.len(),
|
||||||
0,
|
0,
|
||||||
@@ -1106,7 +1111,10 @@ mod tests {
|
|||||||
let mut o = obs([2; 16], 7, 0, None, b"t", b"hi");
|
let mut o = obs([2; 16], 7, 0, None, b"t", b"hi");
|
||||||
o.to = Some([3; 16]);
|
o.to = Some([3; 16]);
|
||||||
o.lifetime_ms = Some(consts::SUMMARY_INTERVAL_MS * 10);
|
o.lifetime_ms = Some(consts::SUMMARY_INTERVAL_MS * 10);
|
||||||
let frame = Frame::Obs { from: [2; 16], obs: o };
|
let frame = Frame::Obs {
|
||||||
|
from: [2; 16],
|
||||||
|
obs: o,
|
||||||
|
};
|
||||||
ex.on_event(Event::Frame(1, frame_bytes(&frame)), &mut store, 0);
|
ex.on_event(Event::Frame(1, frame_bytes(&frame)), &mut store, 0);
|
||||||
|
|
||||||
// Draining must never bounce the addressed obs back to its source (addr
|
// Draining must never bounce the addressed obs back to its source (addr
|
||||||
|
|||||||
@@ -226,7 +226,9 @@ fn observe_to_creates_addressed_message() {
|
|||||||
let (a, _b) = PairTransport::pair(1500);
|
let (a, _b) = PairTransport::pair(1500);
|
||||||
let mut node = Node::new([1u8; 16], 0, MemStore::new(), a);
|
let mut node = Node::new([1u8; 16], 0, MemStore::new(), a);
|
||||||
|
|
||||||
let id = node.observe_to([2; 16], 5000, b"task", b"go", None, 0).unwrap();
|
let id = node
|
||||||
|
.observe_to([2; 16], 5000, b"task", b"go", None, 0)
|
||||||
|
.unwrap();
|
||||||
assert_eq!(node.next_seq(), 1);
|
assert_eq!(node.next_seq(), 1);
|
||||||
|
|
||||||
let obs = node.store().get(&id, 0).expect("observation stored");
|
let obs = node.store().get(&id, 0).expect("observation stored");
|
||||||
@@ -259,7 +261,8 @@ fn belief_excludes_addressed_to_others() {
|
|||||||
// A broadcast observation and an addressed-to-other observation on the
|
// A broadcast observation and an addressed-to-other observation on the
|
||||||
// same topic. `me` = [1;16]; the addressed one is for [2;16] (≠ me).
|
// same topic. `me` = [1;16]; the addressed one is for [2;16] (≠ me).
|
||||||
node.observe(b"door", b"broadcast", None, 0).unwrap();
|
node.observe(b"door", b"broadcast", None, 0).unwrap();
|
||||||
node.observe_to([2; 16], 10_000, b"door", b"addressed", None, 10).unwrap();
|
node.observe_to([2; 16], 10_000, b"door", b"addressed", None, 10)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let now = 100_000u64;
|
let now = 100_000u64;
|
||||||
let belief = node
|
let belief = node
|
||||||
|
|||||||
Reference in New Issue
Block a user