Final clippy fixes

Sovereign-Labs · Jun 7, 2023 · 00cd9aa · 00cd9aa
1 parent 01a15e8
commit 00cd9aa
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 31 deletions.
diff --git a/adapters/celestia/src/da_service.rs b/adapters/celestia/src/da_service.rs
@@ -315,7 +315,10 @@ mod tests {
             .expect("iterator should contain exactly one blob");
 
         let found_data: Vec<u8> = first_blob.data().collect();
-        assert!(&found_data == r#"{"key": "testkey", "value": "testvalue"}"#.as_bytes());
+        assert_eq!(
+            found_data,
+            r#"{"key": "testkey", "value": "testvalue"}"#.as_bytes()
+        );
 
         assert!(blobs.next().is_none());
     }

diff --git a/full-node/db/sov-db/src/schema/types.rs b/full-node/db/sov-db/src/schema/types.rs
@@ -155,9 +155,15 @@ macro_rules! u64_wrapper {
         )]
         pub struct $name(pub u64);
 
-        impl Into<u64> for $name {
-            fn into(self) -> u64 {
-                self.0
+        impl From<u64> for $name {
+            fn from(value: u64) -> Self {
+                Self(value)
+            }
+        }
+
+        impl From<$name> for u64 {
+            fn from(value: $name) -> Self {
+                value.0
             }
         }
     };

diff --git a/module-system/module-implementations/sov-bank/tests/freeze_test.rs b/module-system/module-implementations/sov-bank/tests/freeze_test.rs
@@ -92,11 +92,7 @@ fn freeze_token() {
         token_address: token_address_2.clone(),
     };
 
-    let freeze = bank.call(
-        freeze_message,
-        &unauthorized_context,
-        &mut working_set,
-    );
+    let freeze = bank.call(freeze_message, &unauthorized_context, &mut working_set);
     assert!(freeze.is_err());
     let unauthorized_minter_msg = format!(
         "Sender {} is not an authorized minter",
@@ -111,17 +107,16 @@ fn freeze_token() {
     let mint_message = CallMessage::Mint {
         coins: Coins {
             amount: mint_amount,
-            token_address: token_address,
+            token_address,
         },
         minter_address: new_holder,
     };
 
-    let query_total_supply = |token_address: Address,
-                              working_set: &mut WorkingSet<Storage>|
-     -> Option<u64> {
-        let total_supply: TotalSupplyResponse = bank.supply_of(token_address, working_set);
-        total_supply.amount
-    };
+    let query_total_supply =
+        |token_address: Address, working_set: &mut WorkingSet<Storage>| -> Option<u64> {
+            let total_supply: TotalSupplyResponse = bank.supply_of(token_address, working_set);
+            total_supply.amount
+        };
 
     let minted = bank.call(mint_message, &minter_context, &mut working_set);
     assert!(minted.is_err());
@@ -150,12 +145,11 @@ fn freeze_token() {
     let total_supply = query_total_supply(token_address_2.clone(), &mut working_set);
     assert_eq!(Some(initial_balance + mint_amount), total_supply);
 
-    let query_user_balance = |token_address: Address,
-                              user_address: Address,
-                              working_set: &mut WorkingSet<Storage>|
-     -> Option<u64> {
-        bank.get_balance_of(user_address, token_address, working_set)
-    };
+    let query_user_balance =
+        |token_address: Address,
+         user_address: Address,
+         working_set: &mut WorkingSet<Storage>|
+         -> Option<u64> { bank.get_balance_of(user_address, token_address, working_set) };
     let bal = query_user_balance(token_address_2, minter_address, &mut working_set);
 
     assert_eq!(Some(110), bal);

diff --git a/module-system/module-implementations/sov-bank/tests/transfer_test.rs b/module-system/module-implementations/sov-bank/tests/transfer_test.rs
@@ -104,7 +104,7 @@ fn transfer_initial_token() {
             to: receiver_address.clone(),
             coins: Coins {
                 amount: 1,
-                token_address: token_address,
+                token_address,
             },
         };
 

diff --git a/module-system/sov-modules-macros/src/dispatch/common.rs b/module-system/sov-modules-macros/src/dispatch/common.rs
@@ -153,14 +153,12 @@ pub fn get_attribute_values(item: &syn::DeriveInput, attribute_name: &str) -> Ve
         .iter()
         .find(|attr| attr.path.is_ident(attribute_name))
     {
-        if let Ok(meta) = attr.parse_meta() {
-            if let Meta::List(list) = meta {
-                values.extend(list.nested.iter().map(|n| {
-                    let mut tokens = TokenStream::new();
-                    n.to_tokens(&mut tokens);
-                    tokens
-                }));
-            }
+        if let Ok(Meta::List(list)) = attr.parse_meta() {
+            values.extend(list.nested.iter().map(|n| {
+                let mut tokens = TokenStream::new();
+                n.to_tokens(&mut tokens);
+                tokens
+            }));
         }
     }
 

diff --git a/rollup-interface/src/node/services/da.rs b/rollup-interface/src/node/services/da.rs
@@ -50,6 +50,7 @@ pub trait DaService {
     /// For example, this method might return all of the blob transactions in rollup's namespace on Celestia,
     /// together with a range proof against the root of the namespaced-merkle-tree, demonstrating that the entire
     /// rollup namespace has been covered.
+    #[allow(clippy::type_complexity)]
     fn extract_relevant_txs_with_proof(
         &self,
         block: Self::FilteredBlock,