3 files changed, 30 insertions, 30 deletions

diff --git a/src/swarm/peer/handshake.rs b/src/swarm/peer/handshake.rs
index 7e494c6..109a42f 100644
--- a/src/swarm/peer/handshake.rs
+++ b/src/swarm/peer/handshake.rs
@@ -314,27 +314,27 @@ pub(super) async fn establish_peer(
 ) -> Result<()> {
     let expected_swarm = state.swarm_id().await;
 
-    if let Some(expected) = &expected_swarm {
-        if expected != &swarm_id {
-            bail!(
-                "Incompatible swarm at {peer}: expected {}, received {}",
-                expected,
-                swarm_id
-            );
-        }
+    if let Some(expected) = &expected_swarm
+        && expected != &swarm_id
+    {
+        bail!(
+            "Incompatible swarm at {peer}: expected {}, received {}",
+            expected,
+            swarm_id
+        );
     }
 
     let peer_state_mutex = state.get_or_create_peer_state(peer).await;
     let mut peer_state = peer_state_mutex.lock().await;
 
-    if let Standing::Member { swarm_id: existing } = &peer_state.standing {
-        if existing != &swarm_id {
-            bail!(
-                "Peer {peer} changed swarm identity from {} to {}",
-                existing,
-                swarm_id
-            );
-        }
+    if let Standing::Member { swarm_id: existing } = &peer_state.standing
+        && existing != &swarm_id
+    {
+        bail!(
+            "Peer {peer} changed swarm identity from {} to {}",
+            existing,
+            swarm_id
+        );
     }
 
     // Lock order: peer mutex -> lifecycle.
diff --git a/src/swarm/peer/inbound.rs b/src/swarm/peer/inbound.rs
index 73cc629..745e646 100644
--- a/src/swarm/peer/inbound.rs
+++ b/src/swarm/peer/inbound.rs
@@ -33,12 +33,12 @@ pub(crate) async fn handle_message(
 
     // A reply to a HELLO from an earlier run of ours (late, or queued in Mycelium while
     // we were down) says nothing about now; the peer answers our current HELLO.
-    if let transport::ParsedMessage::HelloReply(reply) = &message {
-        if reply.run_id != state.run_id {
-            state.stats.stale_hello_reply();
-            debug!(peer = %peer, "Ignoring a HELLO_REPLY to a HELLO from an earlier run");
-            return Ok(());
-        }
+    if let transport::ParsedMessage::HelloReply(reply) = &message
+        && reply.run_id != state.run_id
+    {
+        state.stats.stale_hello_reply();
+        debug!(peer = %peer, "Ignoring a HELLO_REPLY to a HELLO from an earlier run");
+        return Ok(());
     }
 
     if !admit(state, &peer, &message).await {
@@ -84,10 +84,10 @@ pub(crate) async fn handle_message(
                 debug!(peer = %peer, "HELLO before we know our swarm; not answering yet");
                 return Ok(());
             };
-            if let Some(theirs) = &hello.swarm_id {
-                if theirs != &swarm_id {
-                    bail!("Incompatible swarm at {peer}: ours is {swarm_id}, it claims {theirs}");
-                }
+            if let Some(theirs) = &hello.swarm_id
+                && theirs != &swarm_id
+            {
+                bail!("Incompatible swarm at {peer}: ours is {swarm_id}, it claims {theirs}");
             }
             // A resent HELLO (our reply was lost) or a late copy of one repeats a
             // handshake we answered already: it must not reset the session again.
diff --git a/src/swarm/peer/worker.rs b/src/swarm/peer/worker.rs
index 20e2542..057e4bd 100644
--- a/src/swarm/peer/worker.rs
+++ b/src/swarm/peer/worker.rs
@@ -82,10 +82,10 @@ pub(crate) async fn run_peer_worker(state: AppState) {
 
             let probe_due =
                 !ping_due && crate::swarm::source::probe_due(&state, peer, Instant::now());
-            if ping_due || probe_due {
-                if let Err(error) = send_ping(&state, peer).await {
-                    debug!(peer = %peer, error = %format!("{error:#}"), "Keepalive PING failed");
-                }
+            if (ping_due || probe_due)
+                && let Err(error) = send_ping(&state, peer).await
+            {
+                debug!(peer = %peer, error = %format!("{error:#}"), "Keepalive PING failed");
             }
 
             if let Err(error) = retry_hello_if_due(&state, peer).await {