From c895ec386a3174976b234e0719c24f7170a55fe2 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Wed, 25 Mar 2020 17:33:20 +0300 Subject: [PATCH] extend full_bucket_discard_pending test --- protocols/kad/src/kbucket/bucket.rs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs index 1b228a01..b190c4b1 100644 --- a/protocols/kad/src/kbucket/bucket.rs +++ b/protocols/kad/src/kbucket/bucket.rs @@ -479,14 +479,22 @@ mod tests { Some((&first_disconnected, NodeStatus::Connected)), bucket.iter().last() ); - /* - assert_eq!( - bucket.position(&first_disconnected.key).map(|p| p.0), - bucket.first_connected_pos - ); - assert_eq!(1, bucket.num_connected()); - assert_eq!(K_VALUE.get() - 1, bucket.num_disconnected()); - */ + + let num_connected = bucket + .iter() + .filter(|(_, s)| *s == NodeStatus::Connected) + .count(); + let num_disconnected = bucket + .iter() + .filter(|(_, s)| *s == NodeStatus::Disconnected) + .count(); + let position = bucket + .iter() + .position(|(n, _)| n.key.as_ref() == first_disconnected.key.as_ref()); + + assert_eq!(1, num_connected); + assert_eq!(K_VALUE.get() - 1, num_disconnected); + assert_eq!(position, Some(num_disconnected)); } #[test]