Merge 1bd5271 into 1f79c18

Author: Frando

Cargo.lock

@@ -19,10 +19,8 @@ derive_more = { version = "2.0.1", features = ["from", "try_from", "into", "debu
 futures-lite = "2.6.0"
 quinn = { package = "iroh-quinn", version = "0.14.0" }
 n0-future = "0.3.0"
-n0-snafu = "0.2.2"
 range-collections = { version = "0.4.6", features = ["serde"] }
 smallvec = { version = "1", features = ["serde", "const_new"] }
-snafu = "0.8.5"
 tokio = { version = "1.43.0", features = ["full"] }
 tokio-util = { version = "0.7.13", features = ["full"] }
 tracing = "0.1.41"
@@ -33,7 +31,6 @@ serde = "1.0.217"
 postcard = { version = "1.1.1", features = ["experimental-derive", "use-std"] }
 data-encoding = "2.8.0"
 chrono = "0.4.39"
-nested_enum_utils = "0.2.1"
 ref-cast = "1.0.24"
 arrayvec = "0.7.6"
 iroh = "0.94"
@@ -42,9 +39,11 @@ genawaiter = { version = "0.99.1", features = ["futures03"] }
 iroh-base = "0.94"
 iroh-tickets = "0.1"
 irpc = { version = "0.10.0", features = ["rpc", "quinn_endpoint_setup", "spans", "stream", "derive"], default-features = false }
-iroh-metrics = { version = "0.36" }
+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"
+nested_enum_utils = "0.2.3"
 
 [dev-dependencies]
 clap = { version = "4.5.31", features = ["derive"] }
@@ -69,3 +68,9 @@ hide-proto-docs = []
 metrics = []
 default = ["hide-proto-docs", "fs-store"]
 fs-store = ["dep:redb", "dep:reflink-copy"]
+
+[patch.crates-io]
+iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
+iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
+irpc = { git = "https://github.com/n0-computer/irpc.git", branch = "matheus23/irpc-n0-error" }
+n0-error = { git = "https://github.com/n0-computer/n0-error.git", branch = "Frando/arc-stack" }

Cargo.toml

@@ -37,7 +37,7 @@ use iroh::{protocol::Router, Endpoint};
 use iroh_blobs::{store::mem::MemStore, BlobsProtocol, ticket::BlobTicket};
 
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
+async fn main() -> n0_error::Result<()> {
     // create an iroh endpoint that includes the standard discovery mechanisms
     // we've built at number0
     let endpoint = Endpoint::bind().await?;

README.md

@@ -1,14 +1,13 @@
 #![allow(dead_code)]
-use anyhow::Result;
 use iroh::SecretKey;
+use n0_error::{Result, StackResultExt};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
 
 /// Gets a secret key from the IROH_SECRET environment variable or generates a new random one.
 /// If the environment variable is set, it must be a valid string representation of a secret key.
 pub fn get_or_generate_secret_key() -> Result<SecretKey> {
     use std::{env, str::FromStr};
 
-    use anyhow::Context;
     if let Ok(secret) = env::var("IROH_SECRET") {
         // Parse the secret key from string
         SecretKey::from_str(&secret).context("Invalid secret key format")

examples/common/mod.rs

@@ -5,7 +5,7 @@
 mod common;
 use std::{fmt::Debug, path::PathBuf};
 
-use anyhow::Result;
+use n0_error::Result;
 use clap::Parser;
 use common::setup_logging;
 use iroh::protocol::ProtocolHandler;

examples/compression.rs

@@ -40,7 +40,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use anyhow::Result;
+use n0_error::Result;
 use clap::Parser;
 use iroh::{
     discovery::pkarr::PkarrResolver,