chore: upgrade to latest iroh, iroh-base, iroh-tickets, and iroh-metrics

Author: “ramfox”

Cargo.lock

@@ -35,15 +35,16 @@ chrono = "0.4.39"
 nested_enum_utils = "0.2.1"
 ref-cast = "1.0.24"
 arrayvec = "0.7.6"
-iroh = { version = "0.94", default-features = false }
+iroh = { version = "0.95", default-features = false }
 self_cell = "1.1.0"
 genawaiter = { version = "0.99.1", features = ["futures03"] }
-iroh-base = "0.94"
-iroh-tickets = "0.1"
-irpc = { version = "0.10.0", features = ["spans", "stream", "derive", "varint-util"], default-features = false }
-iroh-metrics = { version = "0.36" }
+iroh-base = "0.95"
+iroh-tickets = "0.2"
+irpc = { version = "0.11.0", features = ["spans", "stream", "derive", "varint-util"], default-features = false }
+iroh-metrics = { version = "0.37" }
 redb = { version = "2.6.3", optional = true }
 reflink-copy = { version = "0.1.24", optional = true }
+n0-error = "0.1.0"
 
 [dev-dependencies]
 clap = { version = "4.5.31", features = ["derive"] }
@@ -59,7 +60,7 @@ tracing-subscriber = { version = "0.3.20", features = ["fmt"] }
 tracing-test = "0.2.5"
 walkdir = "2.5.0"
 atomic_refcell = "0.1.13"
-iroh = { version = "0.94", features = ["discovery-local-network"]}
+iroh = { version = "0.95", features = ["discovery-local-network"]}
 async-compression = { version = "0.4.30", features = ["lz4", "tokio"] }
 concat_const = "0.2.0"
 
@@ -80,6 +81,3 @@ required-features = ["fs-store"]
 [[example]]
 name = "random_store"
 required-features = ["fs-store"]
-
-[patch.crates-io]
-irpc = { git = "https://github.com/n0-computer/irpc", branch = "main" }

Cargo.toml

@@ -160,7 +160,7 @@ impl<C: Compression> ProtocolHandler for CompressedBlobsProtocol<C> {
             .events
             .client_connected(|| ClientConnected {
                 connection_id,
-                endpoint_id: connection.remote_id().ok(),
+                endpoint_id: Some(connection.remote_id()),
             })
             .await
         {

examples/compression.rs

@@ -177,7 +177,7 @@ impl ProtocolHandler for BlobSearch {
     async fn accept(&self, connection: Connection) -> std::result::Result<(), AcceptError> {
         let this = self.clone();
         // We can get the remote's endpoint id from the connection.
-        let node_id = connection.remote_id()?;
+        let node_id = connection.remote_id();
         println!("accepted connection from {node_id}");
 
         // Our protocol is a simple request-response protocol, so we expect the

examples/custom-protocol.rs

@@ -123,12 +123,12 @@ impl From<ExportBaoError> for Error {
 impl From<irpc::Error> for ExportBaoError {
     fn from(e: irpc::Error) -> Self {
         match e {
-            irpc::Error::MpscRecv(e) => MpscRecvSnafu.into_error(e),
-            irpc::Error::OneshotRecv(e) => OneshotRecvSnafu.into_error(e),
-            irpc::Error::Send(e) => SendSnafu.into_error(e),
-            irpc::Error::Request(e) => RequestSnafu.into_error(e),
+            irpc::Error::MpscRecv { source, .. } => MpscRecvSnafu.into_error(source),
+            irpc::Error::OneshotRecv { source, .. } => OneshotRecvSnafu.into_error(source),
+            irpc::Error::Send { source, .. } => SendSnafu.into_error(source),
+            irpc::Error::Request { source, .. } => RequestSnafu.into_error(source),
             #[cfg(feature = "rpc")]
-            irpc::Error::Write(e) => ExportBaoIoSnafu.into_error(e.into()),
+            irpc::Error::Write { source, .. } => ExportBaoIoSnafu.into_error(source.into()),
         }
     }
 }

src/api.rs

@@ -292,7 +292,7 @@ pub async fn handle_connection(
         if let Err(cause) = progress
             .client_connected(|| ClientConnected {
                 connection_id,
-                endpoint_id: connection.remote_id().ok(),
+                endpoint_id: Some(connection.remote_id()),
             })
             .await
         {

src/provider.rs

@@ -740,7 +740,7 @@ impl BaoFileStorageSubscriber {
         tokio::select! {
             _ = tx.closed() => {
                 // the sender is closed, we are done
-                Err(irpc::channel::SendError::ReceiverClosed.into())
+                Err(n0_error::e!(irpc::channel::SendError::ReceiverClosed).into())
             }
             e = self.receiver.changed() => Ok(e?),
         }