fix fix fix fix

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"
@@ -75,4 +72,4 @@ fs-store = ["dep:redb", "dep:reflink-copy"]
 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/anyhow-ext" }
+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,

examples/custom-protocol.rs

@@ -30,7 +30,7 @@ async fn create_expiring_tag(
     hashes: &[Hash],
     prefix: &str,
     expiry: SystemTime,
-) -> anyhow::Result<()> {
+) -> n0_error::Result<()> {
     let expiry = chrono::DateTime::<chrono::Utc>::from(expiry);
     let expiry = expiry.to_rfc3339_opts(chrono::SecondsFormat::Secs, true);
     let tagname = format!("{prefix}-{expiry}");
@@ -53,7 +53,7 @@ async fn create_expiring_tag(
     Ok(())
 }
 
-async fn delete_expired_tags(blobs: &Store, prefix: &str, bulk: bool) -> anyhow::Result<()> {
+async fn delete_expired_tags(blobs: &Store, prefix: &str, bulk: bool) -> n0_error::Result<()> {
     let prefix = format!("{prefix}-");
     let now = chrono::Utc::now();
     let end = format!(
@@ -100,7 +100,7 @@ async fn delete_expired_tags(blobs: &Store, prefix: &str, bulk: bool) -> anyhow:
     Ok(())
 }
 
-async fn print_store_info(store: &Store) -> anyhow::Result<()> {
+async fn print_store_info(store: &Store) -> n0_error::Result<()> {
     let now = chrono::Utc::now();
     let mut tags = store.tags().list().await?;
     println!(
@@ -121,23 +121,23 @@ async fn print_store_info(store: &Store) -> anyhow::Result<()> {
     Ok(())
 }
 
-async fn info_task(store: Store) -> anyhow::Result<()> {
+async fn info_task(store: Store) -> n0_error::Result<()> {
     tokio::time::sleep(Duration::from_secs(1)).await;
     loop {
         print_store_info(&store).await?;
         tokio::time::sleep(Duration::from_secs(5)).await;
     }
 }
 
-async fn delete_expired_tags_task(store: Store, prefix: &str) -> anyhow::Result<()> {
+async fn delete_expired_tags_task(store: Store, prefix: &str) -> n0_error::Result<()> {
     loop {
         delete_expired_tags(&store, prefix, false).await?;
         tokio::time::sleep(Duration::from_secs(5)).await;
     }
 }
 
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
+async fn main() -> n0_error::Result<()> {
     tracing_subscriber::fmt::init();
     let path = std::env::current_dir()?.join("blobs");
     let options = Options {

examples/expiring-tags.rs

@@ -25,15 +25,15 @@ pub struct Cli {
 }
 
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
+async fn main() -> n0_error::Result<()> {
     setup_logging();
     let cli = Cli::parse();
     let ticket = cli.ticket;
     let endpoint = iroh::Endpoint::empty_builder(iroh::RelayMode::Default)
         .discovery(PkarrResolver::n0_dns())
         .bind()
         .await?;
-    anyhow::ensure!(
+    n0_error::ensure!(
         ticket.format() == BlobFormat::Raw,
         "This example only supports raw blobs."
     );
@@ -54,10 +54,10 @@ async fn main() -> anyhow::Result<()> {
                     break stats;
                 }
                 Some(GetBlobItem::Error(err)) => {
-                    anyhow::bail!("Error while streaming blob: {err}");
+                    n0_error::bail!("Error while streaming blob: {err}");
                 }
                 None => {
-                    anyhow::bail!("Stream ended unexpectedly.");
+                    n0_error::bail!("Stream ended unexpectedly.");
                 }
             }
         }

examples/get-blob.rs

@@ -18,7 +18,7 @@ use std::{
     },
 };
 
-use anyhow::Result;
+use n0_error::Result;
 use clap::Parser;
 use common::setup_logging;
 use iroh::{protocol::Router, EndpointAddr, EndpointId, SecretKey};

examples/limit.rs

@@ -13,7 +13,7 @@
 //! Run that command on another machine in the same local network, replacing [FILE_PATH] to the path on which you want to save the transferred content.
 use std::path::{Path, PathBuf};
 
-use anyhow::{ensure, Result};
+use n0_error::{ensure, Result};
 use clap::{Parser, Subcommand};
 use iroh::{
     discovery::mdns::MdnsDiscovery, protocol::Router, Endpoint, PublicKey, RelayMode, SecretKey,
@@ -127,7 +127,7 @@ async fn connect(node_id: PublicKey, hash: Hash, out: Option<PathBuf>) -> Result
 }
 
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
+async fn main() -> n0_error::Result<()> {
     setup_logging();
     let cli = Cli::parse();