Skip to content
This repository has been archived by the owner on Jun 25, 2021. It is now read-only.

Commit

Permalink
fix(tests): refactor delivery group tests
Browse files Browse the repository at this point in the history
- It did not take into account the changes of min delivery group size.
  • Loading branch information
oetyng authored and dirvine committed Apr 21, 2021
1 parent 0cd8eb7 commit 6437b76
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/delivery_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,18 @@ fn candidates(
.map(|info| (&info.prefix, info.elders.len(), info.elders.values()));

// gives at least 1 honest target among recipients.
let min_group_size = 1 + ELDER_SIZE - supermajority(ELDER_SIZE);
let mut dg_size = min_group_size;
let min_dg_size = 1 + ELDER_SIZE - supermajority(ELDER_SIZE);
let mut dg_size = min_dg_size;
let mut nodes_to_send = Vec::new();
for (idx, (prefix, len, connected)) in sections.enumerate() {
nodes_to_send.extend(connected.cloned());
// If we don't have enough contacts send to as many as possible
// up to dg_size of Elders
dg_size = cmp::min(len, dg_size);
if len < min_group_size {
if len < min_dg_size {
warn!(
"Delivery group only {:?} when it should be {:?}",
len, min_group_size
len, min_dg_size
)
}

Expand Down Expand Up @@ -268,7 +268,8 @@ mod tests {
let expected_recipients = elders_info1
.peers()
.sorted_by(|lhs, rhs| dst_name.cmp_distance(lhs.name(), rhs.name()));
assert_eq!(dg_size, elders_info1.elders.len());
let min_dg_size = 1 + elders_info1.elders.len() - supermajority(elders_info1.elders.len());
assert_eq!(dg_size, min_dg_size);
itertools::assert_equal(&recipients, expected_recipients);

Ok(())
Expand All @@ -290,7 +291,8 @@ mod tests {
let expected_recipients = elders_info1
.peers()
.sorted_by(|lhs, rhs| dst_name.cmp_distance(lhs.name(), rhs.name()));
assert_eq!(dg_size, elders_info1.elders.len());
let min_dg_size = 1 + elders_info1.elders.len() - supermajority(elders_info1.elders.len());
assert_eq!(dg_size, min_dg_size);
itertools::assert_equal(&recipients, expected_recipients);

Ok(())
Expand Down

0 comments on commit 6437b76

Please sign in to comment.