simplify stop and remove peer

osmosis-labs · Jun 25, 2024 · c59c930 · c59c930
1 parent ff05627
commit c59c930
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/p2p/switch.go b/p2p/switch.go
@@ -440,25 +440,16 @@ func (sw *Switch) stopAndRemovePeer(peer Peer, reason interface{}) {
 	// https://github.com/tendermint/tendermint/issues/3338
 	if sw.peers.Remove(peer) {
 		sw.metrics.Peers.Add(float64(-1))
-		if peer.IsOutbound() {
-			if sw.config.RegionAware {
-				region, err := sw.addrBook.GetAddressRegion(peer.SocketAddr())
-				if err != nil {
-					sw.Logger.Error("error getting region of peer when stopping peer", "peer", peer.ID(), "err", err)
-					return
-				}
-				if region != sw.MyRegion {
-					sw.CurrentNumOutboundPeersInOtherRegion--
-				}
+		if sw.config.RegionAware {
+			region, err := sw.addrBook.GetAddressRegion(peer.SocketAddr())
+			if err != nil {
+				sw.Logger.Error("error getting region of peer when stopping peer", "peer", peer.ID(), "err", err)
+				return
 			}
-		} else {
-			if sw.config.RegionAware {
-				region, err := sw.addrBook.GetAddressRegion(peer.SocketAddr())
-				if err != nil {
-					sw.Logger.Error("error getting region of peer when stopping peer", "peer", peer.ID(), "err", err)
-					return
-				}
-				if region != sw.MyRegion {
+			if region != sw.MyRegion {
+				if peer.IsOutbound() {
+					sw.CurrentNumOutboundPeersInOtherRegion--
+				} else {
 					sw.CurrentNumInboundPeersInOtherRegion--
 				}
 			}