n0-computer
diff --git a/‎iroh/examples/0rtt.rs‎
Lines changed: 2 additions & 4 deletions b/‎iroh/examples/0rtt.rs‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎iroh/examples/transfer.rs‎
Lines changed: 1 addition & 1 deletion b/‎iroh/examples/transfer.rs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎iroh/src/discovery.rs‎
Lines changed: 3 additions & 13 deletions b/‎iroh/src/discovery.rs‎
Lines changed: 3 additions & 13 deletions
@@ -144,10 +144,8 @@ async fn accept(_args: Args) -> n0_snafu::Result<()> {
         let Some(addr) = addrs.next().await else {
             snafu::whatever!("Address stream closed");
         };
-        if let Some(addr) = addr {
-            if !addr.direct_addresses.is_empty() {
-                break addr;
-            }
+        if !addr.direct_addresses.is_empty() {
+            break addr;
         }
     };
     println!("Listening on: {addr:?}");
 
@@ -273,7 +273,7 @@ impl EndpointArgs {
         let node_id = endpoint.node_id();
         println!("Our node id:\n\t{node_id}");
 
-        let node_addr = endpoint.watch_node_addr().initialized().await;
+        let node_addr = endpoint.node_addr();
 
         println!("Our direct addresses:");
         for addr in &node_addr.direct_addresses {
 
@@ -641,7 +641,6 @@ mod tests {
 
     use iroh_base::{NodeAddr, SecretKey};
     use n0_snafu::{Error, Result, ResultExt};
-    use n0_watcher::Watcher as _;
     use quinn::{IdleTimeout, TransportConfig};
     use rand::{Rng, SeedableRng};
     use tokio_util::task::AbortOnDropHandle;
@@ -770,8 +769,6 @@ mod tests {
             new_endpoint(secret, disco).await
         };
         let ep1_addr = NodeAddr::new(ep1.node_id());
-        // wait for our address to be updated and thus published at least once
-        ep1.watch_node_addr().initialized().await;
         let _conn = ep2.connect(ep1_addr, TEST_ALPN).await?;
         Ok(())
     }
@@ -796,8 +793,6 @@ mod tests {
             new_endpoint(secret, disco).await
         };
         let ep1_addr = NodeAddr::new(ep1.node_id());
-        // wait for our address to be updated and thus published at least once
-        ep1.watch_node_addr().initialized().await;
         let _conn = ep2.connect(ep1_addr, TEST_ALPN).await?;
         Ok(())
     }
@@ -823,8 +818,7 @@ mod tests {
             new_endpoint(secret, disco).await
         };
         let ep1_addr = NodeAddr::new(ep1.node_id());
-        // wait for out address to be updated and thus published at least once
-        ep1.watch_node_addr().initialized().await;
+
         let _conn = ep2
             .connect(ep1_addr, TEST_ALPN)
             .await
@@ -856,8 +850,7 @@ mod tests {
             disco.add(disco3);
             new_endpoint(secret, disco).await
         };
-        // wait for out address to be updated and thus published at least once
-        ep1.watch_node_addr().initialized().await;
+
         let _conn = ep2.connect(ep1.node_id(), TEST_ALPN).await?;
         Ok(())
     }
@@ -880,8 +873,6 @@ mod tests {
             let disco = ConcurrentDiscovery::from_services(vec![Box::new(disco1)]);
             new_endpoint(secret, disco).await
         };
-        // wait for out address to be updated and thus published at least once
-        ep1.watch_node_addr().initialized().await;
 
         // 10x faster test via a 3s idle timeout instead of the 30s default
         let mut config = TransportConfig::default();
@@ -915,8 +906,7 @@ mod tests {
             let disco = disco_shared.create_discovery(secret.public());
             new_endpoint(secret, disco).await
         };
-        // wait for out address to be updated and thus published at least once
-        ep1.watch_node_addr().initialized().await;
+
         let ep1_wrong_addr = NodeAddr {
             node_id: ep1.node_id(),
             relay_url: None,