From ac775affefdde6d3d8d4aa47a03e7dae03850ed2 Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Wed, 4 Dec 2024 10:21:10 +0000
Subject: [PATCH] nit: decrease branch nesting

---
 crates/librqbit/src/torrent_state/live/mod.rs |  6 +-----
 .../src/torrent_state/live/peer/mod.rs        | 19 +++++++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/crates/librqbit/src/torrent_state/live/mod.rs b/crates/librqbit/src/torrent_state/live/mod.rs
index 5dbfa7e..b0e17c7 100644
--- a/crates/librqbit/src/torrent_state/live/mod.rs
+++ b/crates/librqbit/src/torrent_state/live/mod.rs
@@ -824,11 +824,7 @@ impl TorrentStateLive {
         self.peers
             .states
             .iter_mut()
-            .filter_map(|mut p| {
-                let known_addr = *p.key();
-                p.value_mut()
-                    .reconnect_not_needed_peer(known_addr, &self.peers)
-            })
+            .filter_map(|mut p| p.value_mut().reconnect_not_needed_peer(&self.peers))
             .map(|socket_addr| self.peer_queue_tx.send(socket_addr))
             .take_while(|r| r.is_ok())
             .last();
diff --git a/crates/librqbit/src/torrent_state/live/peer/mod.rs b/crates/librqbit/src/torrent_state/live/peer/mod.rs
index f7f2dac..c495f43 100644
--- a/crates/librqbit/src/torrent_state/live/peer/mod.rs
+++ b/crates/librqbit/src/torrent_state/live/peer/mod.rs
@@ -56,22 +56,21 @@ impl Peer {
 
     pub(crate) fn reconnect_not_needed_peer(
         &mut self,
-        known_address: SocketAddr,
         counters: &PeerStates,
     ) -> Option<SocketAddr> {
         if let PeerState::NotNeeded = self.get_state() {
             match self.outgoing_address {
                 None => None,
+                Some(socket_addr) if self.addr == socket_addr => {
+                    self.set_state(PeerState::Queued, counters);
+                    Some(socket_addr)
+                }
                 Some(socket_addr) => {
-                    if known_address == socket_addr {
-                        self.set_state(PeerState::Queued, counters);
-                    } else {
-                        debug!(
-                            peer = known_address.to_string(),
-                            outgoing_addr = socket_addr.to_string(),
-                            "peer will by retried on different address",
-                        );
-                    }
+                    debug!(
+                        peer = %self.addr,
+                        outgoing_addr = %socket_addr,
+                        "peer will by retried on different address",
+                    );
                     Some(socket_addr)
                 }
             }