fix: address reconnect review feedback

Author: jjyr

crates/fiber-lib/src/fiber/network.rs

@@ -1160,7 +1160,7 @@ where
                 }
                 if let Some(session) = session {
                     debug!(
-                        "Disconnecting peer {:?} session w {:?}ith reason {:?}",
+                        "Disconnecting peer {:?} session {:?} with reason {:?}",
                         &pubkey, &session, &reason
                     );
                     state.control.disconnect(session).await?;

crates/fiber-lib/src/fiber/tests/channel.rs

@@ -4434,18 +4434,31 @@ async fn test_peer_disconnect_with_active_channel_enters_backoff_reconnect() {
 
     let (mut node_a, mut node_b, _new_channel_id, _) =
         NetworkNode::new_2_nodes_with_established_channel(100000000000, 100000000000, true).await;
+    let saw_seeded = std::cell::Cell::new(false);
+    let saw_scheduled = std::cell::Cell::new(false);
+    let saw_disconnect = std::cell::Cell::new(false);
 
     node_b.stop().await;
 
     node_a
-        .expect_debug_event("PeerReconnectBackoffSeededByDisconnect")
-        .await;
-    node_a
-        .expect_debug_event("PeerReconnectBackoffScheduled")
-        .await;
-    node_a
-        .expect_event(|event| {
-            matches!(event, NetworkServiceEvent::PeerDisConnected(id, _) if id == &node_b.pubkey)
+        .expect_to_process_event(|event| {
+            match event {
+                NetworkServiceEvent::DebugEvent(DebugEvent::Common(msg))
+                    if msg == "PeerReconnectBackoffSeededByDisconnect" =>
+                {
+                    saw_seeded.set(true);
+                }
+                NetworkServiceEvent::DebugEvent(DebugEvent::Common(msg))
+                    if msg == "PeerReconnectBackoffScheduled" =>
+                {
+                    saw_scheduled.set(true);
+                }
+                NetworkServiceEvent::PeerDisConnected(id, _) if id == &node_b.pubkey => {
+                    saw_disconnect.set(true);
+                }
+                _ => {}
+            }
+            (saw_seeded.get() && saw_scheduled.get() && saw_disconnect.get()).then_some(())
         })
         .await;
 }

crates/fiber-lib/src/fiber/tests/network.rs

@@ -9,7 +9,7 @@ use crate::{
     fiber::{
         gossip::{GossipActorMessage, GossipMessageStore},
         graph::ChannelUpdateInfo,
-        network::{AcceptChannelCommand, NetworkActorStateStore, OpenChannelCommand},
+        network::{AcceptChannelCommand, DebugEvent, NetworkActorStateStore, OpenChannelCommand},
         payment::{SendPaymentCommand, SendPaymentDataExt},
         types::{
             broadcast_message_to_gossip, BroadcastMessageWithTimestamp,
@@ -750,15 +750,25 @@ async fn test_peer_disconnect_without_active_channel_skips_backoff_reconnect() {
     init_tracing();
 
     let [mut node1, mut node2] = NetworkNode::new_n_interconnected_nodes().await;
+    let saw_debug = std::cell::Cell::new(false);
+    let saw_disconnect = std::cell::Cell::new(false);
 
     node2.stop().await;
 
     node1
-        .expect_debug_event("PeerReconnectBackoffSkippedNoDirectChannel")
-        .await;
-    node1
-        .expect_event(|event| {
-            matches!(event, NetworkServiceEvent::PeerDisConnected(id, _) if id == &node2.pubkey)
+        .expect_to_process_event(|event| {
+            match event {
+                NetworkServiceEvent::DebugEvent(DebugEvent::Common(msg))
+                    if msg == "PeerReconnectBackoffSkippedNoDirectChannel" =>
+                {
+                    saw_debug.set(true);
+                }
+                NetworkServiceEvent::PeerDisConnected(id, _) if id == &node2.pubkey => {
+                    saw_disconnect.set(true);
+                }
+                _ => {}
+            }
+            (saw_debug.get() && saw_disconnect.get()).then_some(())
         })
         .await;
 }