thiserror compatibility

Author: aumetra

contracts/cyberpunk/src/errors.rs

@@ -5,11 +5,5 @@ use thiserror::Error;
 pub enum ContractError {
     #[error("{0}")]
     /// this is needed so we can use `bucket.load(...)?` and have it auto-converted to the custom error
-    Std(StdError),
-}
-
-impl From<StdError> for ContractError {
-    fn from(err: StdError) -> Self {
-        Self::Std(err)
-    }
+    Std(#[from] StdError),
 }

contracts/hackatom/src/errors.rs

@@ -5,17 +5,11 @@ use thiserror::Error;
 pub enum HackError {
     #[error("{0}")]
     /// this is needed so we can use `bucket.load(...)?` and have it auto-converted to the custom error
-    Std(StdError),
+    Std(#[from] StdError),
     // this is whatever we want
     #[error("Unauthorized")]
     Unauthorized {},
     // this is whatever we want
     #[error("Downgrade is not supported")]
     Downgrade,
 }
-
-impl From<StdError> for HackError {
-    fn from(err: StdError) -> Self {
-        Self::Std(err)
-    }
-}

contracts/reflect/src/errors.rs

@@ -5,16 +5,10 @@ use thiserror::Error;
 pub enum ReflectError {
     #[error("{0}")]
     // let thiserror implement From<StdError> for you
-    Std(StdError),
+    Std(#[from] StdError),
     // this is whatever we want
     #[error("Permission denied: the sender is not the current owner")]
     NotCurrentOwner { expected: String, actual: String },
     #[error("Messages empty. Must reflect at least one message")]
     MessagesEmpty,
 }
-
-impl From<StdError> for ReflectError {
-    fn from(err: StdError) -> Self {
-        Self::Std(err)
-    }
-}

contracts/virus/src/errors.rs

@@ -5,13 +5,7 @@ use thiserror::Error;
 pub enum ContractError {
     #[error("{0}")]
     /// this is needed so we can use `bucket.load(...)?` and have it auto-converted to the custom error
-    Std(StdError),
+    Std(#[from] StdError),
     #[error("{0}")]
     Instantiate2Address(#[from] Instantiate2AddressError),
 }
-
-impl From<StdError> for ContractError {
-    fn from(err: StdError) -> Self {
-        Self::Std(err)
-    }
-}

packages/std/src/errors/std_error.rs

@@ -1,6 +1,6 @@
 use alloc::string::ToString;
 use core::fmt;
-use std::{error::Error, str, string};
+use std::{error::Error, ops::Deref, str, string};
 
 use super::BT;
 
@@ -58,6 +58,14 @@ impl AsRef<dyn Error + Send + Sync> for StdError {
     }
 }
 
+impl Deref for StdError {
+    type Target = dyn Error + Send + Sync;
+
+    fn deref(&self) -> &Self::Target {
+        &*self.0.inner
+    }
+}
+
 impl StdError {
     pub fn msg<D>(msg: D) -> Self
     where
@@ -294,6 +302,12 @@ mod tests {
     use core::str;
     use std::string;
 
+    #[derive(Debug, thiserror::Error)]
+    enum AssertThiserrorWorks {
+        #[error(transparent)]
+        Std(#[from] StdError),
+    }
+
     #[test]
     fn implements_debug() {
         let error: StdError = StdError::from(OverflowError::new(OverflowOperation::Sub));