Use thiserror, regenerate lockfiles

CosmWasm · Apr 9, 2024 · ab6b92f · ab6b92f
1 parent db219f6
commit ab6b92f
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 67 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
diff --git a/contracts/empty/Cargo.lock b/contracts/empty/Cargo.lock
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock
diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml
@@ -20,9 +20,10 @@ schemars = { version = "0.8.16", optional = true }
 serde = { version = "1.0.197", default-features = false, features = ["alloc", "derive"] }
 sha2 = { version = "0.10.8", default-features = false }
 static_assertions = "1.1.0"
+thiserror = { version = "1.0.26", optional = true }
 
 [features]
-std = ["dep:schemars"]
+std = ["dep:schemars", "dep:thiserror"]
 
 [dev-dependencies]
 # Cyclic dependencies for doc tests..

diff --git a/packages/core/src/addresses.rs b/packages/core/src/addresses.rs
@@ -250,6 +250,7 @@ impl fmt::Display for CanonicalAddr {
 }
 
 #[derive(Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum Instantiate2AddressError {
     /// Checksum must be 32 bytes
     InvalidChecksumLength,
@@ -266,9 +267,6 @@ impl fmt::Display for Instantiate2AddressError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Instantiate2AddressError {}
-
 /// Creates a contract address using the predictable address format introduced with
 /// wasmd 0.29. When using instantiate2, this is a way to precompute the address.
 /// When using instantiate, the contract address will use a different algorithm and

diff --git a/packages/core/src/errors/core_error.rs b/packages/core/src/errors/core_error.rs
@@ -22,6 +22,7 @@ use crate::errors::{RecoverPubkeyError, VerificationError};
 /// - Add enum case
 /// - Add creator function in std_error_helpers.rs
 #[derive(Display, Debug)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum CoreError {
     #[display("Verification error: {source}")]
     VerificationErr {
@@ -178,9 +179,6 @@ impl CoreError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CoreError {}
-
 impl PartialEq<CoreError> for CoreError {
     fn eq(&self, rhs: &CoreError) -> bool {
         match self {
@@ -421,6 +419,7 @@ impl fmt::Display for OverflowOperation {
 }
 
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 #[display("Cannot {operation} with given operands")]
 pub struct OverflowError {
     pub operation: OverflowOperation,
@@ -432,16 +431,14 @@ impl OverflowError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for OverflowError {}
-
 /// The error returned by [`TryFrom`] conversions that overflow, for example
 /// when converting from [`Uint256`] to [`Uint128`].
 ///
 /// [`TryFrom`]: core::convert::TryFrom
 /// [`Uint256`]: crate::Uint256
 /// [`Uint128`]: crate::Uint128
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 #[display("Error converting {source_type} to {target_type}")]
 pub struct ConversionOverflowError {
     pub source_type: &'static str,
@@ -457,10 +454,8 @@ impl ConversionOverflowError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for ConversionOverflowError {}
-
 #[derive(Display, Debug, Default, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 #[display("Cannot divide by zero")]
 pub struct DivideByZeroError;
 
@@ -470,10 +465,8 @@ impl DivideByZeroError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for DivideByZeroError {}
-
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum DivisionError {
     #[display("Divide by zero")]
     DivideByZero,
@@ -482,10 +475,9 @@ pub enum DivisionError {
     Overflow,
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for DivisionError {}
-
-#[derive(Display, Debug, From, PartialEq, Eq)]
+#[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
+#[cfg_attr(not(feature = "std"), derive(From))]
 pub enum CheckedMultiplyFractionError {
     #[display("{_0}")]
     DivideByZero(#[from] DivideByZeroError),
@@ -497,10 +489,8 @@ pub enum CheckedMultiplyFractionError {
     Overflow(#[from] OverflowError),
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CheckedMultiplyFractionError {}
-
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum CheckedMultiplyRatioError {
     #[display("Denominator must not be zero")]
     DivideByZero,
@@ -509,10 +499,8 @@ pub enum CheckedMultiplyRatioError {
     Overflow,
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CheckedMultiplyRatioError {}
-
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum CheckedFromRatioError {
     #[display("Denominator must not be zero")]
     DivideByZero,
@@ -521,39 +509,31 @@ pub enum CheckedFromRatioError {
     Overflow,
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CheckedFromRatioError {}
-
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 #[display("Round up operation failed because of overflow")]
 pub struct RoundUpOverflowError;
 
-#[cfg(feature = "std")]
-impl std::error::Error for RoundUpOverflowError {}
-
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 #[display("Round down operation failed because of overflow")]
 pub struct RoundDownOverflowError;
 
-#[cfg(feature = "std")]
-impl std::error::Error for RoundDownOverflowError {}
-
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum CoinsError {
     #[display("Duplicate denom")]
     DuplicateDenom,
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CoinsError {}
-
 impl From<CoinsError> for CoreError {
     fn from(value: CoinsError) -> Self {
         Self::generic_err(format!("Creating Coins: {value}"))
     }
 }
 
 #[derive(Display, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum CoinFromStrError {
     #[display("Missing denominator")]
     MissingDenom,
@@ -563,9 +543,6 @@ pub enum CoinFromStrError {
     InvalidAmount(core::num::ParseIntError),
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CoinFromStrError {}
-
 impl From<core::num::ParseIntError> for CoinFromStrError {
     fn from(value: core::num::ParseIntError) -> Self {
         Self::InvalidAmount(value)