fix: don't stop an ongoing walk just because we don't yet have a connection to an always-allowed peer

Author: jcnelson

stackslib/src/net/neighbors/mod.rs

@@ -303,27 +303,10 @@ impl PeerNetwork {
     /// Returns true if we instantiated the walk.
     /// Returns false if not.
     fn setup_walk(&mut self, ibd: bool) -> bool {
-        // we unconditionally need to begin walking if we're not connected to any always-allowed
-        // peer
-        let mut need_new_peers = false;
-        let (num_always_connected, total_always_connected) = self
-            .count_connected_always_allowed_peers()
-            .unwrap_or((0, 0));
-        if num_always_connected == 0 && total_always_connected > 0 {
-            // force a reset
-            debug!("{:?}: not connected to any always-allowed peers; forcing a walk reset to try and fix this", &self.local_peer);
-            self.reset_walk();
-
-            // TODO: force choosing an always-allowed peer!
-            //
-            need_new_peers = true;
-        }
-
         if self.walk.is_none() {
             // time to do a walk yet?
-            if !need_new_peers
-                && (self.walk_count > self.connection_opts.num_initial_walks
-                    || self.walk_retries > self.connection_opts.walk_retry_count)
+            if (self.walk_count > self.connection_opts.num_initial_walks
+                || self.walk_retries > self.connection_opts.walk_retry_count)
                 && self.walk_deadline > get_epoch_time_secs()
             {
                 // we've done enough walks for an initial mixing, or we can't connect to anyone,

stackslib/src/net/neighbors/walk.rs

@@ -565,7 +565,6 @@ impl<DB: NeighborWalkDB, NC: NeighborComms> NeighborWalk<DB, NC> {
     }
 
     /// Select neighbors that are routable, and ignore ones that are not.
-    /// TODO: expand if we ever want to filter by unroutable network class or something
     fn filter_sensible_neighbors(
         mut neighbors: Vec<NeighborAddress>,
         private_neighbors: bool,