fixup

Author: Frando

Cargo.lock

@@ -16,7 +16,7 @@ pub const QUIC_ADDR_DISC_CLOSE_REASON: &[u8] = b"finished";
 
 #[cfg(feature = "server")]
 pub(crate) mod server {
-    use n0_error::{StdResultExt, e};
+    use n0_error::e;
     use quinn::{
         ApplicationClose, ConnectionError,
         crypto::rustls::{NoInitialCipherSuite, QuicServerConfig},
@@ -360,7 +360,7 @@ impl QuicClient {
 mod tests {
     use std::net::Ipv4Addr;
 
-    use n0_error::{Error, Result, StdResultExt};
+    use n0_error::{Result, StdResultExt};
     use n0_future::{
         task::AbortOnDropHandle,
         time::{self, Instant},

iroh-relay/src/quic.rs

@@ -26,7 +26,7 @@ use hyper::body::Incoming;
 use iroh_base::EndpointId;
 #[cfg(feature = "test-utils")]
 use iroh_base::RelayUrl;
-use n0_error::{Err, Error, StdResultExt, add_meta, e};
+use n0_error::{Error, add_meta, e};
 use n0_future::{StreamExt, future::Boxed};
 use tokio::{
     net::TcpListener,

iroh-relay/src/server.rs

@@ -3,7 +3,7 @@
 use std::{collections::HashSet, sync::Arc, time::Duration};
 
 use iroh_base::EndpointId;
-use n0_error::{Err, Error, StackResultExt, add_meta, e};
+use n0_error::{Err, Error, add_meta, e};
 use n0_future::{SinkExt, StreamExt};
 use rand::Rng;
 use time::{Date, OffsetDateTime};
@@ -500,7 +500,7 @@ pub(crate) enum SendError {
 #[add_meta]
 #[derive(Error)]
 #[display("failed to forward {scope:?} packet: {reason:?}")]
-pub(crate) struct ForwardPacketError {
+pub struct ForwardPacketError {
     scope: PacketScope,
     reason: SendError,
 }
@@ -724,8 +724,8 @@ mod tests {
 
         // Send a frame, it should arrive.
         info!("-- send packet");
-        frame_writer.send(frame.clone()).await.context("send")?;
-        frame_writer.flush().await.context("flush")?;
+        frame_writer.send(frame.clone()).await.std_context("send")?;
+        frame_writer.flush().await.std_context("flush")?;
         let recv_frame = tokio::time::timeout(Duration::from_millis(500), stream.next())
             .await
             .expect("timeout")
@@ -735,8 +735,8 @@ mod tests {
 
         // Next frame does not arrive.
         info!("-- send packet");
-        frame_writer.send(frame.clone()).await.context("send")?;
-        frame_writer.flush().await.context("flush")?;
+        frame_writer.send(frame.clone()).await.std_context("send")?;
+        frame_writer.flush().await.std_context("flush")?;
         let res = tokio::time::timeout(Duration::from_millis(100), stream.next()).await;
         assert!(res.is_err(), "expecting a timeout");
         info!("-- timeout happened");

iroh-relay/src/server/client.rs

@@ -15,7 +15,7 @@ use hyper::{
     service::Service,
     upgrade::Upgraded,
 };
-use n0_error::{Err, Error, StackResultExt, StdResultExt, add_meta, e};
+use n0_error::{Err, Error, add_meta, e};
 use n0_future::time::Elapsed;
 use tokio::net::{TcpListener, TcpStream};
 use tokio_rustls_acme::AcmeAcceptor;

iroh-relay/src/server/http_server.rs

@@ -17,7 +17,7 @@ use iroh::{
     endpoint::{Connecting, Connection},
     protocol::{AcceptError, ProtocolHandler, Router},
 };
-use n0_error::{Result, StdResultExt};
+use n0_error::{Err, Result, StdResultExt};
 
 /// Each protocol is identified by its ALPN string.
 ///
@@ -110,9 +110,7 @@ impl ProtocolHandler for ScreenedEcho {
         // reject every other connection
         if count % 2 == 0 {
             println!("rejecting connection");
-            return Err(AcceptError::NotAllowed {
-                meta: n0_error::Meta::new(),
-            });
+            return Err!(AcceptError::NotAllowed);
         }
 
         // To allow normal connection construction, await the connecting future & return