Merge pull request #82 from apollodao/dev/stderror-constructors

fix: Use StdError constructor functions

Author: iboss-ptk

packages/osmosis-std-derive/src/lib.rs

@@ -77,7 +77,7 @@ pub fn derive_cosmwasm_ext(input: TokenStream) -> TokenStream {
                     type_url: Self::TYPE_URL.to_string(),
                     value: self.to_proto_bytes(),
                 }
-            }            
+            }
         }
 
         #query_request_conversion
@@ -102,20 +102,16 @@ pub fn derive_cosmwasm_ext(input: TokenStream) -> TokenStream {
 
             fn try_from(binary: cosmwasm_std::Binary) -> Result<Self, Self::Error> {
                 use ::prost::Message;
-                #[cfg(feature = "backtraces")]
-                use std::backtrace::Backtrace;
                 Self::decode(&binary[..]).map_err(|e| {
-                    cosmwasm_std::StdError::ParseErr {
-                        target_type: stringify!(#ident).to_string(),
-                        msg: format!(
+                    cosmwasm_std::StdError::parse_err(
+                        stringify!(#ident),
+                        format!(
                             "Unable to decode binary: \n  - base64: {}\n  - bytes array: {:?}\n\n{:?}",
                             binary,
                             binary.to_vec(),
                             e
-                        ),
-                        #[cfg(feature = "backtraces")]
-                        backtrace: Backtrace::capture(),
-                    }
+                        )
+                    )
                 })
             }
         }
@@ -124,21 +120,11 @@ pub fn derive_cosmwasm_ext(input: TokenStream) -> TokenStream {
             type Error = cosmwasm_std::StdError;
 
             fn try_from(result: cosmwasm_std::SubMsgResult) -> Result<Self, Self::Error> {
-                #[cfg(feature = "backtraces")]
-                use std::backtrace::Backtrace;
                 result
                     .into_result()
-                    .map_err(|e| cosmwasm_std::StdError::GenericErr {
-                        msg: e,
-                        #[cfg(feature = "backtraces")]
-                        backtrace: Backtrace::capture(),
-                    })?
+                    .map_err(|e| cosmwasm_std::StdError::generic_err(e))?
                     .data
-                    .ok_or_else(|| cosmwasm_std::StdError::NotFound {
-                        kind: "cosmwasm_std::SubMsgResult::<T>".to_string(),
-                        #[cfg(feature = "backtraces")]
-                        backtrace: Backtrace::capture(),
-                    })?
+                    .ok_or_else(|| cosmwasm_std::StdError::not_found("cosmwasm_std::SubMsgResult::<T>"))?
                     .try_into()
             }
         }

packages/osmosis-std/README.md

@@ -85,14 +85,12 @@ fn query_pool(
 ) -> StdResult<osmosis_std::types::osmosis::gamm::v1beta1::Pool> {
     let res = GammQuerier::new(&deps.querier).pool(pool_id)?;
     res.pool
-        .ok_or_else(|| StdError::NotFound {
-            kind: "pool".to_string(),
-        })?
+        .ok_or_else(|| StdError::not_found("pool"))?
         .try_into() // convert `Any` to `osmosis_std::types::osmosis::gamm::v1beta1::Pool`
-        .map_err(|e: DecodeError| StdError::ParseErr {
-            target_type: "osmosis_std::types::osmosis::gamm::v1beta1::Pool".to_string(),
-            msg: e.to_string(),
-        })
+        .map_err(|e: DecodeError| StdError::parse_err(
+            "osmosis_std::types::osmosis::gamm::v1beta1::Pool",
+            e
+        ))
 }
 ```
 
@@ -119,10 +117,10 @@ impl TryFrom<osmosis_std::shim::Any> for Pool {
             return Ok(Pool::StableSwap(pool));
         }
 
-        Err(StdError::ParseErr {
-            target_type: "Pool".to_string(),
-            msg: "Unmatched pool: must be either `Balancer` or `StableSwap`.".to_string(),
-        })
+        Err(StdError::parse_err(
+            "Pool",
+            "Unmatched pool: must be either `Balancer` or `StableSwap`."
+        ))
     }
 }
 
@@ -132,9 +130,7 @@ fn query_pool(
 ) -> StdResult<Pool> {
     let res = GammQuerier::new(&deps.querier).pool(pool_id)?;
     res.pool
-        .ok_or_else(|| StdError::NotFound {
-            kind: "pool".to_string(),
-        })?
+        .ok_or_else(|| StdError::not_found("pool"))?
         .try_into() // convert `Any` to `Pool`
 }
 ```