fixup

Author: Frando

iroh/examples/transfer.rs

@@ -17,7 +17,7 @@ use iroh::{
     endpoint::ConnectionError,
 };
 use iroh_base::ticket::EndpointTicket;
-use n0_error::{Result, StackResultExt, StdResultExt, whatever};
+use n0_error::{Result, StdResultExt};
 use n0_future::task::AbortOnDropHandle;
 use n0_watcher::Watcher as _;
 use tokio_stream::StreamExt;
@@ -183,8 +183,9 @@ impl EndpointArgs {
         let mut builder = Endpoint::builder();
 
         let secret_key = match std::env::var("IROH_SECRET") {
-            Ok(s) => SecretKey::from_str(&s)
-                .context("Failed to parse IROH_SECRET environment variable as iroh secret key")?,
+            Ok(s) => SecretKey::from_str(&s).std_context(
+                "Failed to parse IROH_SECRET environment variable as iroh secret key",
+            )?,
             Err(_) => {
                 let s = SecretKey::generate(&mut rand::rng());
                 println!("Generated a new endpoint secret. To reuse, set");
@@ -248,7 +249,7 @@ impl EndpointArgs {
                 .await
                 .std_context("Failed to resolve DNS server address")?
                 .next()
-                .context("Failed to resolve DNS server address")?;
+                .std_context("Failed to resolve DNS server address")?;
             builder = builder.dns_resolver(DnsResolver::with_nameserver(addr));
         } else if self.env == Env::Dev {
             let addr = DEV_DNS_SERVER.parse().expect("valid addr");

iroh/src/discovery.rs

@@ -650,7 +650,7 @@ mod tests {
     };
 
     use iroh_base::{EndpointAddr, SecretKey};
-    use n0_error::{AnyError as Error, Result, StackResultExt, StdResultExt};
+    use n0_error::{AnyError as Error, Result, StdResultExt};
     use quinn::{IdleTimeout, TransportConfig};
     use rand::{CryptoRng, Rng, SeedableRng};
     use tokio_util::task::AbortOnDropHandle;
@@ -826,7 +826,7 @@ mod tests {
         let _conn = ep2
             .connect(ep1_addr, TEST_ALPN)
             .await
-            .context("connecting")?;
+            .std_context("connecting")?;
         Ok(())
     }
 
@@ -969,7 +969,7 @@ mod tests {
 mod test_dns_pkarr {
     use iroh_base::{EndpointAddr, SecretKey};
     use iroh_relay::{RelayMap, endpoint_info::UserData};
-    use n0_error::{AnyError as Error, Result, StackResultExt, StdResultExt};
+    use n0_error::{AnyError as Error, Result, StdResultExt};
     use n0_future::time::Duration;
     use rand::{CryptoRng, SeedableRng};
     use tokio_util::task::AbortOnDropHandle;

iroh/src/discovery/mdns.rs

@@ -544,7 +544,7 @@ mod tests {
     /// tests)
     mod run_in_isolation {
         use iroh_base::SecretKey;
-        use n0_error::{AnyError as Error, Result, StackResultExt, StdResultExt, whatever};
+        use n0_error::{AnyError as Error, Result, StdResultExt, whatever};
         use n0_future::StreamExt;
         use rand::{CryptoRng, SeedableRng};
         use tracing_test::traced_test;

iroh/src/discovery/pkarr/dht.rs

@@ -333,7 +333,7 @@ mod tests {
     use std::collections::BTreeSet;
 
     use iroh_base::RelayUrl;
-    use n0_error::{Result, StackResultExt, StdResultExt};
+    use n0_error::{Result, StdResultExt};
     use tracing_test::traced_test;
 
     use super::*;

iroh/src/endpoint.rs

@@ -2121,7 +2121,7 @@ mod tests {
     use std::time::{Duration, Instant};
 
     use iroh_base::{EndpointAddr, EndpointId, SecretKey};
-    use n0_error::{AnyError as Error, StackResultExt, StdResultExt};
+    use n0_error::{AnyError as Error, StdResultExt};
     use n0_future::{BufferedStreamExt, StreamExt, stream, task::AbortOnDropHandle};
     type Result<T = (), E = Error> = std::result::Result<T, E>;
     use n0_watcher::Watcher;

iroh/src/magicsock.rs

@@ -2537,7 +2537,7 @@ mod tests {
 
     use data_encoding::HEXLOWER;
     use iroh_base::{EndpointAddr, EndpointId, PublicKey};
-    use n0_error::{AnyError, Result, StackResultExt, StdResultExt};
+    use n0_error::{Result, StdResultExt};
     use n0_future::{StreamExt, time};
     use n0_watcher::Watcher;
     use quinn::ServerConfig;

iroh/src/net_report.rs

@@ -963,7 +963,7 @@ mod tests {
 
     use iroh_base::RelayUrl;
     use iroh_relay::dns::DnsResolver;
-    use n0_error::{Result, StackResultExt, StdResultExt};
+    use n0_error::{Result, StdResultExt};
     use tokio_util::sync::CancellationToken;
     use tracing_test::traced_test;
 

iroh/src/net_report/reportgen.rs

@@ -865,7 +865,7 @@ mod tests {
     use std::net::Ipv4Addr;
 
     use iroh_relay::dns::DnsResolver;
-    use n0_error::{Result, StackResultExt, StdResultExt};
+    use n0_error::{Result, StdResultExt};
     use tracing_test::traced_test;
 
     use super::{super::test_utils, *};

iroh/tests/integration.rs

@@ -13,7 +13,7 @@ use iroh::{
     Endpoint, RelayMode,
     discovery::{Discovery, pkarr::PkarrResolver},
 };
-use n0_error::{Result, StackResultExt, StdResultExt};
+use n0_error::{Result, StdResultExt};
 use n0_future::{
     StreamExt, task,
     time::{self, Duration},