From 9a2cfe5a5c9c2f58c8775752db77cb289eceb80e Mon Sep 17 00:00:00 2001 From: Delweng Date: Fri, 28 Jun 2024 23:15:40 +0800 Subject: [PATCH] fix(net/peer): remove the duplicated disconnect logic (#9162) Signed-off-by: jsvisa --- crates/net/network/src/peers.rs | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/crates/net/network/src/peers.rs b/crates/net/network/src/peers.rs index c7e6a05a57..03082e19b4 100644 --- a/crates/net/network/src/peers.rs +++ b/crates/net/network/src/peers.rs @@ -325,15 +325,6 @@ impl PeersManager { peer.state = PeerConnectionState::In; is_trusted = is_trusted || peer.is_trusted(); - - // if a peer is not trusted and we don't have capacity for more inbound connections, - // disconnecting the peer - if !is_trusted && !has_in_capacity { - self.queued_actions.push_back(PeerAction::Disconnect { - peer_id, - reason: Some(DisconnectReason::TooManyPeers), - }); - } } Entry::Vacant(entry) => { // peer is missing in the table, we add it but mark it as to be removed after @@ -342,16 +333,16 @@ impl PeersManager { peer.remove_after_disconnect = true; entry.insert(peer); self.queued_actions.push_back(PeerAction::PeerAdded(peer_id)); - - // disconnect the peer if we don't have capacity for more inbound connections - if !is_trusted && !has_in_capacity { - self.queued_actions.push_back(PeerAction::Disconnect { - peer_id, - reason: Some(DisconnectReason::TooManyPeers), - }); - } } } + + // disconnect the peer if we don't have capacity for more inbound connections + if !is_trusted && !has_in_capacity { + self.queued_actions.push_back(PeerAction::Disconnect { + peer_id, + reason: Some(DisconnectReason::TooManyPeers), + }); + } } /// Bans the peer temporarily with the configured ban timeout