protocols/kad: Fix number of remaining bootstrap requests. (#2125)

Fixes #2121

Co-authored-by: Max Inden <[email protected]>
Co-authored-by: @izolyomi

Author: rubdos

protocols/kad/CHANGELOG.md

@@ -13,8 +13,11 @@
 
 - Remove false `debug_assert` on `connected_peers` (see [PR 2120]).
 
+- Return correct number of remaining bootstrap requests (see [PR 2125]).
+
 [PR 2087]: https://github.com/libp2p/rust-libp2p/pull/2087
 [PR 2120]: https://github.com/libp2p/rust-libp2p/pull/2120
+[PR 2125]: https://github.com/libp2p/rust-libp2p/pull/2125
 
 # 0.30.0 [2021-04-13]
 

protocols/kad/src/behaviour.rs

@@ -1113,7 +1113,7 @@ where
                         }).collect::<Vec<_>>().into_iter()
                 });
 
-                let num_remaining = remaining.len().saturating_sub(1) as u32;
+                let num_remaining = remaining.len() as u32;
 
                 if let Some(target) = remaining.next() {
                     let info = QueryInfo::Bootstrap {

protocols/kad/src/behaviour/test.rs

@@ -196,6 +196,10 @@ fn bootstrap() {
                                 }
                                 first = false;
                                 if ok.num_remaining == 0 {
+                                    assert_eq!(
+                                        swarm.behaviour_mut().queries.size(), 0,
+                                        "Expect no remaining queries when `num_remaining` is zero.",
+                                    );
                                     let mut known = HashSet::new();
                                     for b in swarm.behaviour_mut().kbuckets.iter() {
                                         for e in b.iter() {