From 95fdddbb546bad3891a9758ad51dc7fcdf06c35e Mon Sep 17 00:00:00 2001
From: "Franz Heinzmann (Frando)" <frando@unbiskant.org>
Date: Thu, 23 May 2024 01:46:03 +0200
Subject: [PATCH] fixup

---
 iroh-gossip/src/net.rs       | 4 ++--
 iroh-net/src/conn_manager.rs | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/iroh-gossip/src/net.rs b/iroh-gossip/src/net.rs
index fc81efd928..3aeb5dc28e 100644
--- a/iroh-gossip/src/net.rs
+++ b/iroh-gossip/src/net.rs
@@ -384,7 +384,7 @@ impl Actor {
                 Some(res) = self.conn_manager.next() => {
                     trace!(?i, "tick: conn_manager");
                     match res {
-                        Ok(conn) => self.handle_new_connection(conn).await,
+                        Ok(conn) => self.handle_new_connection(conn),
                         Err(err) => {
                             self.handle_in_event(InEvent::PeerDisconnected(err.node_id), Instant::now()).await?;
                         }
@@ -545,7 +545,7 @@ impl Actor {
         Ok(())
     }
 
-    async fn handle_new_connection(&mut self, new_conn: ConnInfo) {
+    fn handle_new_connection(&mut self, new_conn: ConnInfo) {
         let ConnInfo {
             conn,
             node_id,
diff --git a/iroh-net/src/conn_manager.rs b/iroh-net/src/conn_manager.rs
index 418b3ab133..43e5cf3b69 100644
--- a/iroh-net/src/conn_manager.rs
+++ b/iroh-net/src/conn_manager.rs
@@ -440,9 +440,6 @@ mod tests {
         }
 
         tasks.abort_all();
-        while let Some(r) = tasks.join_next().await {
-            assert!(r.unwrap_err().is_cancelled());
-        }
 
         Ok(())
     }