feat!: concrete errors

Cargo.toml

@@ -40,3 +40,6 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l
 
 [workspace.lints.clippy]
 unused-async = "warn"
+
+[patch.crates-io]
+n0-snafu = { git = "https://github.com/n0-computer/n0-snafu", branch = "expand-test-error" }

iroh-base/Cargo.toml

@@ -23,7 +23,9 @@ url = { version = "2.5.3", features = ["serde"], optional = true }
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"], optional = true }
 rand_core = { version = "0.6.4", optional = true }
 serde = { version = "1", features = ["derive", "rc"] }
-thiserror = { version = "2", optional = true }
+snafu = { version = "0.8.5", features = ["rust_1_81"], optional = true }
+n0-snafu = "0.1.0"
+nested_enum_utils = "0.2.0"
 
 [dev-dependencies]
 postcard = { version = "1", features = ["use-std"] }
@@ -41,15 +43,15 @@ key = [
   "dep:ed25519-dalek",
   "dep:url",
   "dep:derive_more",
-  "dep:thiserror",
+  "dep:snafu",
   "dep:data-encoding",
   "dep:rand_core",
   "relay",
 ]
 relay = [
   "dep:url",
   "dep:derive_more",
-  "dep:thiserror",
+  "dep:snafu",
 ]
 
 [package.metadata.docs.rs]

iroh-base/src/key.rs

@@ -9,10 +9,12 @@ use std::{
 };
 
 use curve25519_dalek::edwards::CompressedEdwardsY;
-pub use ed25519_dalek::Signature;
-use ed25519_dalek::{SignatureError, SigningKey, VerifyingKey};
+pub use ed25519_dalek::{Signature, SignatureError};
+use ed25519_dalek::{SigningKey, VerifyingKey};
+use nested_enum_utils::common_fields;
 use rand_core::CryptoRngCore;
 use serde::{Deserialize, Serialize};
+use snafu::{Backtrace, Snafu};
 
 /// A public key.
 ///
@@ -180,17 +182,26 @@ impl Display for PublicKey {
 }
 
 /// Error when deserialising a [`PublicKey`] or a [`SecretKey`].
-#[derive(thiserror::Error, Debug)]
+#[common_fields({
+    backtrace: Option<Backtrace>,
+    #[snafu(implicit)]
+    span_trace: n0_snafu::SpanTrace,
+})]
+#[derive(Snafu, Debug)]
+#[allow(missing_docs)]
+#[snafu(visibility(pub(crate)))]
 pub enum KeyParsingError {
     /// Error when decoding.
-    #[error("decoding: {0}")]
-    Decode(#[from] data_encoding::DecodeError),
+    #[snafu(transparent)]
+    Decode { source: data_encoding::DecodeError },
     /// Error when decoding the public key.
-    #[error("key: {0}")]
-    Key(#[from] ed25519_dalek::SignatureError),
+    #[snafu(transparent)]
+    Key {
+        source: ed25519_dalek::SignatureError,
+    },
     /// The encoded information had the wrong length.
-    #[error("invalid length")]
-    DecodeInvalidLength,
+    #[snafu(display("invalid length"))]
+    DecodeInvalidLength {},
 }
 
 /// Deserialises the [`PublicKey`] from it's base32 encoding.
@@ -333,14 +344,14 @@ fn decode_base32_hex(s: &str) -> Result<[u8; 32], KeyParsingError> {
         let input = s.to_ascii_uppercase();
         let input = input.as_bytes();
         if data_encoding::BASE32_NOPAD.decode_len(input.len())? != bytes.len() {
-            return Err(KeyParsingError::DecodeInvalidLength);
+            return Err(DecodeInvalidLengthSnafu.build());
         }
         data_encoding::BASE32_NOPAD.decode_mut(input, &mut bytes)
     };
     match res {
         Ok(len) => {
             if len != PublicKey::LENGTH {
-                return Err(KeyParsingError::DecodeInvalidLength);
+                return Err(DecodeInvalidLengthSnafu.build());
             }
         }
         Err(partial) => return Err(partial.error.into()),

iroh-base/src/lib.rs

@@ -15,7 +15,7 @@ mod node_addr;
 mod relay_url;
 
 #[cfg(feature = "key")]
-pub use self::key::{KeyParsingError, NodeId, PublicKey, SecretKey, Signature};
+pub use self::key::{KeyParsingError, NodeId, PublicKey, SecretKey, Signature, SignatureError};
 #[cfg(feature = "key")]
 pub use self::node_addr::NodeAddr;
 #[cfg(feature = "relay")]