Jelajahi Sumber

refactor: use transparent error

thesimplekid 1 tahun lalu
induk
melakukan
76688c35e4

+ 11 - 11
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}`")]

+ 11 - 11
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),
 }
 

+ 5 - 5
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,

+ 3 - 3
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),
 }
 

+ 1 - 1
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),
 }