From 76688c35e4bcfaea39ef5001d094d2fae230bf77 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Fri, 12 Apr 2024 17:19:07 +0100 Subject: [PATCH] refactor: use transparent error --- crates/cdk/src/error.rs | 22 +++++++++++----------- crates/cdk/src/mint/localstore/mod.rs | 22 +++++++++++----------- crates/cdk/src/mint/mod.rs | 10 +++++----- crates/cdk/src/nuts/nut12.rs | 6 +++--- crates/cdk/src/url.rs | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/crates/cdk/src/error.rs b/crates/cdk/src/error.rs index 519a64e2..a76ffe4a 100644 --- a/crates/cdk/src/error.rs +++ b/crates/cdk/src/error.rs @@ -8,22 +8,22 @@ use crate::util::hex; #[derive(Debug, Error)] pub enum Error { /// Parse Url Error - #[error("`{0}`")] + #[error(transparent)] UrlParseError(#[from] url::ParseError), /// Utf8 parse error - #[error("`{0}`")] + #[error(transparent)] Utf8ParseError(#[from] FromUtf8Error), /// Serde Json error - #[error("`{0}`")] + #[error(transparent)] SerdeJsonError(#[from] serde_json::Error), /// Base64 error - #[error("`{0}`")] + #[error(transparent)] Base64Error(#[from] base64::DecodeError), /// From hex error - #[error("`{0}`")] + #[error(transparent)] HexError(#[from] hex::Error), /// Secp256k1 error - #[error("`{0}`")] + #[error(transparent)] Secp256k1(#[from] bitcoin::secp256k1::Error), #[error("No Key for Amoun")] AmountKey, @@ -53,16 +53,16 @@ pub enum Error { InvalidSignature, #[error("Locktime in past")] LocktimeInPast, - #[error("`{0}`")] + #[error(transparent)] Secret(#[from] super::secret::Error), - #[error("`{0}`")] + #[error(transparent)] NUT01(#[from] crate::nuts::nut01::Error), - #[error("`{0}`")] + #[error(transparent)] NUT02(#[from] crate::nuts::nut02::Error), #[cfg(feature = "nut13")] - #[error("`{0}`")] + #[error(transparent)] Bip32(#[from] bitcoin::bip32::Error), - #[error("`{0}`")] + #[error(transparent)] ParseInt(#[from] std::num::ParseIntError), /// Custom error #[error("`{0}`")] diff --git a/crates/cdk/src/mint/localstore/mod.rs b/crates/cdk/src/mint/localstore/mod.rs index cbc20dce..c57701d9 100644 --- a/crates/cdk/src/mint/localstore/mod.rs +++ b/crates/cdk/src/mint/localstore/mod.rs @@ -19,35 +19,35 @@ use crate::types::{MeltQuote, MintQuote}; #[derive(Debug, Error)] pub enum Error { #[cfg(all(not(target_arch = "wasm32"), feature = "redb"))] - #[error("`{0}`")] + #[error(transparent)] Redb(#[from] redb::Error), #[cfg(all(not(target_arch = "wasm32"), feature = "redb"))] - #[error("`{0}`")] + #[error(transparent)] Database(#[from] redb::DatabaseError), #[cfg(all(not(target_arch = "wasm32"), feature = "redb"))] - #[error("`{0}`")] + #[error(transparent)] Transaction(#[from] redb::TransactionError), #[cfg(all(not(target_arch = "wasm32"), feature = "redb"))] - #[error("`{0}`")] + #[error(transparent)] Commit(#[from] redb::CommitError), #[cfg(all(not(target_arch = "wasm32"), feature = "redb"))] - #[error("`{0}`")] + #[error(transparent)] Table(#[from] redb::TableError), #[cfg(all(not(target_arch = "wasm32"), feature = "redb"))] - #[error("`{0}`")] + #[error(transparent)] Storage(#[from] redb::StorageError), #[cfg(all(not(target_arch = "wasm32"), feature = "redb"))] - #[error("`{0}`")] + #[error(transparent)] Serde(#[from] serde_json::Error), - #[error("`{0}`")] + #[error(transparent)] ParseInt(#[from] ParseIntError), #[error("Unknown Mint Info")] UnknownMintInfo, - #[error("`{0}`")] + #[error(transparent)] Cashu(#[from] crate::error::Error), - #[error("`{0}`")] + #[error(transparent)] CashuNut02(#[from] crate::nuts::nut02::Error), - #[error("`{0}`")] + #[error(transparent)] Secret(#[from] crate::secret::Error), } diff --git a/crates/cdk/src/mint/mod.rs b/crates/cdk/src/mint/mod.rs index 1083730e..68af9ae7 100644 --- a/crates/cdk/src/mint/mod.rs +++ b/crates/cdk/src/mint/mod.rs @@ -44,15 +44,15 @@ pub enum Error { UnpaidQuote, #[error("`{0}`")] Custom(String), - #[error("`{0}`")] + #[error(transparent)] CashuMint(#[from] crate::error::mint::Error), - #[error("`{0}`")] + #[error(transparent)] Cashu(#[from] crate::error::Error), - #[error("`{0}`")] + #[error(transparent)] Localstore(#[from] localstore::Error), - #[error("`{0}`")] + #[error(transparent)] Secret(#[from] crate::secret::Error), - #[error("`{0}`")] + #[error(transparent)] Nut12(#[from] crate::nuts::nut12::Error), #[error("Unknown quote")] UnknownQuote, diff --git a/crates/cdk/src/nuts/nut12.rs b/crates/cdk/src/nuts/nut12.rs index aeae791d..7eff45b0 100644 --- a/crates/cdk/src/nuts/nut12.rs +++ b/crates/cdk/src/nuts/nut12.rs @@ -20,11 +20,11 @@ pub enum Error { IncompleteDleqProof, #[error("Invalid Dleq Prood")] InvalidDleqProof, - #[error("`{0}`")] + #[error(transparent)] Cashu(#[from] crate::error::Error), - #[error("`{0}`")] + #[error(transparent)] NUT01(#[from] crate::nuts::nut01::Error), - #[error("`{0}`")] + #[error(transparent)] Secp256k1(#[from] secp256k1::Error), } diff --git a/crates/cdk/src/url.rs b/crates/cdk/src/url.rs index 5065822c..5e965605 100644 --- a/crates/cdk/src/url.rs +++ b/crates/cdk/src/url.rs @@ -14,7 +14,7 @@ use url::{ParseError, Url}; #[derive(Debug, Error, PartialEq, Eq)] pub enum Error { /// Url error - #[error("`{0}`")] + #[error(transparent)] Url(#[from] ParseError), }