feat(networking): remove self.close_group and checks there as unused

check_for_changes_in_close_group only updated self, which was only used in the process of calling the function. The boolean was not used anywhere in the code, so we could safely remove this
maidsafe · Jul 17, 2024 · 27bf1ac · 27bf1ac
1 parent 7a16c14
commit 27bf1ac
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 33 deletions.
diff --git a/sn_networking/src/cmd.rs b/sn_networking/src/cmd.rs
@@ -832,7 +832,6 @@ impl SwarmDriver {
             warn!("Cleaning out bad_peer {peer_id:?}");
             if let Some(dead_peer) = self.swarm.behaviour_mut().kademlia.remove_peer(&peer_id) {
                 self.update_on_peer_removal(*dead_peer.node.key.preimage());
-                let _ = self.check_for_change_in_our_close_group();
             }
 
             if is_new_bad {

diff --git a/sn_networking/src/driver.rs b/sn_networking/src/driver.rs
@@ -592,7 +592,6 @@ impl NetworkBuilder {
             peers_in_rt: 0,
             bootstrap,
             relay_manager,
-            close_group: Default::default(),
             replication_fetcher,
             #[cfg(feature = "open-metrics")]
             network_metrics,
@@ -635,7 +634,6 @@ pub struct SwarmDriver {
     pub(crate) bootstrap: ContinuousBootstrap,
     pub(crate) relay_manager: RelayManager,
     /// The peers that are closer to our PeerId. Includes self.
-    pub(crate) close_group: Vec<PeerId>,
     pub(crate) replication_fetcher: ReplicationFetcher,
     #[cfg(feature = "open-metrics")]
     pub(crate) network_metrics: Option<NetworkMetrics>,

diff --git a/sn_networking/src/event/kad.rs b/sn_networking/src/event/kad.rs
@@ -263,7 +263,6 @@ impl SwarmDriver {
                     info!("Evicted old peer on new peer join: {old_peer:?}");
                     self.update_on_peer_removal(old_peer);
                 }
-                let _ = self.check_for_change_in_our_close_group();
             }
             kad::Event::InboundRequest {
                 request: InboundRequest::PutRecord { .. },

diff --git a/sn_networking/src/event/mod.rs b/sn_networking/src/event/mod.rs
@@ -10,7 +10,7 @@ mod kad;
 mod request_response;
 mod swarm;
 
-use crate::{driver::SwarmDriver, error::Result, CLOSE_GROUP_SIZE};
+use crate::{driver::SwarmDriver, error::Result};
 use core::fmt;
 use custom_debug::Debug as CustomDebug;
 #[cfg(feature = "local-discovery")]
@@ -27,7 +27,7 @@ use sn_protocol::{
 };
 use sn_transfers::PaymentQuote;
 use std::{
-    collections::{BTreeSet, HashSet},
+    collections::BTreeSet,
     fmt::{Debug, Formatter},
 };
 use tokio::sync::oneshot;
@@ -236,29 +236,6 @@ impl Debug for NetworkEvent {
 }
 
 impl SwarmDriver {
-    /// Check for changes in our close group
-    pub(crate) fn check_for_change_in_our_close_group(&mut self) -> bool {
-        // this includes self
-        let closest_k_peers = self.get_closest_k_value_local_peers();
-
-        let new_closest_peers: Vec<_> =
-            closest_k_peers.into_iter().take(CLOSE_GROUP_SIZE).collect();
-
-        let old = self.close_group.iter().cloned().collect::<HashSet<_>>();
-        let new_members: Vec<_> = new_closest_peers
-            .iter()
-            .filter(|p| !old.contains(p))
-            .collect();
-        if !new_members.is_empty() {
-            debug!("The close group has been updated. The new members are {new_members:?}");
-            debug!("New close group: {new_closest_peers:?}");
-            self.close_group = new_closest_peers;
-            true
-        } else {
-            false
-        }
-    }
-
     /// Update state on addition of a peer to the routing table.
     pub(crate) fn update_on_peer_addition(&mut self, added_peer: PeerId) {
         self.peers_in_rt = self.peers_in_rt.saturating_add(1);

diff --git a/sn_networking/src/event/swarm.rs b/sn_networking/src/event/swarm.rs
@@ -143,7 +143,6 @@ impl SwarmDriver {
                             {
                                 error!("Clearing out a protocol mistmatch peer from RT. Something went wrong, we should not have added this peer to RT: {peer_id:?}");
                                 self.update_on_peer_removal(*dead_peer.node.key.preimage());
-                                let _ = self.check_for_change_in_our_close_group();
                             }
 
                             return Ok(());
@@ -549,8 +548,6 @@ impl SwarmDriver {
                             peer_id: failed_peer_id,
                             issue: crate::NodeIssue::ConnectionIssue,
                         })?;
-
-                        let _ = self.check_for_change_in_our_close_group();
                     }
                 }
             }
@@ -661,7 +658,6 @@ impl SwarmDriver {
                 .remove_peer(&to_be_removed_bootstrap);
             if let Some(removed_peer) = entry {
                 self.update_on_peer_removal(*removed_peer.node.key.preimage());
-                let _ = self.check_for_change_in_our_close_group();
             }
         }
     }