Merge pull request #4 from Autonomy-Network/r/registry-clippy

clippy1
Autonomy-Network · Mar 27, 2023 · d050df1 · d050df1
2 parents 26cc586 + b08b335
commit d050df1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/contracts/registry-stake/src/contract.rs b/contracts/registry-stake/src/contract.rs
@@ -292,7 +292,7 @@ pub fn create_request(
     }
 
     // Recurring requests can't have input assets
-    if request_info.is_recurring && request_info.input_asset != None {
+    if request_info.is_recurring && request_info.input_asset.is_some() {
         return Err(ContractError::NoInputAssetForRecurring {});
     }
 

diff --git a/contracts/registry-stake/src/testing/mock_querier.rs b/contracts/registry-stake/src/testing/mock_querier.rs
@@ -45,7 +45,7 @@ impl Querier for WasmMockQuerier {
             Ok(v) => v,
             Err(e) => {
                 return SystemResult::Err(SystemError::InvalidRequest {
-                    error: format!("Parsing query request: {}", e),
+                    error: format!("Parsing query request: {e}"),
                     request: bin_request.into(),
                 })
             }

diff --git a/packages/autonomy/src/asset.rs b/packages/autonomy/src/asset.rs
@@ -110,8 +110,8 @@ pub enum AssetInfo {
 impl fmt::Display for AssetInfo {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            AssetInfo::NativeToken { denom } => write!(f, "{}", denom),
-            AssetInfo::Token { contract_addr } => write!(f, "{}", contract_addr),
+            AssetInfo::NativeToken { denom } => write!(f, "{denom}"),
+            AssetInfo::Token { contract_addr } => write!(f, "{contract_addr}"),
         }
     }
 }
@@ -193,8 +193,7 @@ impl AssetInfo {
             AssetInfo::NativeToken { denom } => {
                 if !denom.starts_with("ibc/") && denom != &denom.to_lowercase() {
                     return Err(StdError::generic_err(format!(
-                        "Non-IBC token denom {} should be lowercase",
-                        denom
+                        "Non-IBC token denom {denom} should be lowercase"
                     )));
                 }
             }
@@ -211,8 +210,7 @@ impl AssetInfo {
 pub fn addr_validate_to_lower(api: &dyn Api, addr: &str) -> StdResult<Addr> {
     if addr.to_lowercase() != addr {
         return Err(StdError::generic_err(format!(
-            "Address {} should be lowercase",
-            addr
+            "Address {addr} should be lowercase"
         )));
     }
     api.addr_validate(addr)

diff --git a/packages/autonomy/src/error.rs b/packages/autonomy/src/error.rs
@@ -27,7 +27,7 @@ impl From<CommonError> for StdError {
     fn from(source: CommonError) -> Self {
         match source {
             CommonError::Std(e) => e,
-            e => StdError::generic_err(format!("{}", e)),
+            e => StdError::generic_err(format!("{e}")),
         }
     }
 }