Clippy

anoma · Jan 12, 2023 · b2a4067 · b2a4067
1 parent f4325fb
commit b2a4067
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 36 deletions.
diff --git a/apps/src/lib/node/ledger/shell/finalize_block.rs b/apps/src/lib/node/ledger/shell/finalize_block.rs
@@ -820,7 +820,7 @@ mod test_finalize_block {
         let tx_code = std::fs::read(wasm_path)
             .expect("Expected a file at given code path");
         let raw_tx = Tx::new(
-            tx_code.clone(),
+            tx_code,
             Some("Encrypted transaction data".as_bytes().to_owned()),
         );
         let wrapper_tx = WrapperTx::new(
@@ -847,7 +847,7 @@ mod test_finalize_block {
 
         let processed_tx = ProcessedTx {
             tx: Tx::from(TxType::Decrypted(DecryptedTx::Decrypted {
-                tx: raw_tx.clone(),
+                tx: raw_tx,
                 #[cfg(not(feature = "mainnet"))]
                 has_valid_pow: false,
             }))
@@ -866,7 +866,7 @@ mod test_finalize_block {
             })
             .expect("Test failed")[0];
 
-        // FIXME: @grarco, uncomment when proper gas metering is in place
+        // FIXME: uncomment when proper gas metering is in place
         // // Check inner tx hash has been removed from storage
         // assert_eq!(event.event_type.to_string(), String::from("applied"));
         // let code = event.attributes.get("code").expect("Test

diff --git a/apps/src/lib/node/ledger/shell/process_proposal.rs b/apps/src/lib/node/ledger/shell/process_proposal.rs
@@ -37,10 +37,10 @@ where
         let tx_results = self.process_txs(&req.txs);
 
         ProcessProposal {
-            status: if tx_results.iter().any(|res| match res.code {
-                1 | 2 | 4 | 5 | 7 => true,
-                _ => false,
-            }) {
+            status: if tx_results
+                .iter()
+                .any(|res| matches!(res.code, 1 | 2 | 4 | 5 | 7))
+            {
                 ProposalStatus::Reject as i32
             } else {
                 ProposalStatus::Accept as i32
@@ -88,7 +88,7 @@ where
     /// INVARIANT: Any changes applied in this method must be reverted if the
     /// proposal is rejected (unless we can simply overwrite them in the
     /// next block).
-    pub(crate) fn process_single_tx<'a>(
+    pub(crate) fn process_single_tx(
         &mut self,
         tx_bytes: &[u8],
         tx_queue_index: &mut usize,
@@ -214,20 +214,20 @@ where
                                 ),
                             };
                         }
-                        if let (Some(m), _) =
-                            self.write_log.read(&inner_hash_key)
+                        // Check in WAL for replay attack in the same block
+                        if let (
+                            Some(StorageModification::Write { value: _ }),
+                            _,
+                        ) = self.write_log.read(&inner_hash_key)
                         {
-                            // Check in WAL for replay attack in the same block
-                            if let StorageModification::Write { value: _ } = m {
-                                return TxResult {
-                                    code: ErrorCodes::ReplayTx.into(),
-                                    info: format!(
-                                        "Inner transaction hash {} already in \
-                                         storage, replay attempt",
-                                        &tx.tx_hash
-                                    ),
-                                };
-                            }
+                            return TxResult {
+                                code: ErrorCodes::ReplayTx.into(),
+                                info: format!(
+                                    "Inner transaction hash {} already in \
+                                     storage, replay attempt",
+                                    &tx.tx_hash
+                                ),
+                            };
                         }
 
                         // Write inner hash to WAL
@@ -258,20 +258,20 @@ where
                                 ),
                             };
                         }
-                        if let (Some(m), _) =
-                            self.write_log.read(&wrapper_hash_key)
+                        // Check in WAL for replay attack in the same block
+                        if let (
+                            Some(StorageModification::Write { value: _ }),
+                            _,
+                        ) = self.write_log.read(&wrapper_hash_key)
                         {
-                            // Check in WAL for replay attack in the same block
-                            if let StorageModification::Write { value: _ } = m {
-                                return TxResult {
-                                    code: ErrorCodes::ReplayTx.into(),
-                                    info: format!(
-                                        "Wrapper transaction hash {} already \
-                                         in storage, replay attempt",
-                                        wrapper_hash
-                                    ),
-                                };
-                            }
+                            return TxResult {
+                                code: ErrorCodes::ReplayTx.into(),
+                                info: format!(
+                                    "Wrapper transaction hash {} already in \
+                                     storage, replay attempt",
+                                    wrapper_hash
+                                ),
+                            };
                         }
 
                         // Write wrapper hash to WAL

diff --git a/shared/src/ledger/native_vp/replay_protection.rs b/shared/src/ledger/native_vp/replay_protection.rs
@@ -61,11 +61,10 @@ where
     }
 }
 
+#[allow(clippy::upper_case_acronyms)]
 enum KeyType {
-    #[allow(clippy::upper_case_acronyms)]
     #[allow(non_camel_case_types)]
     TX_HASH,
-    #[allow(clippy::upper_case_acronyms)]
     UNKNOWN,
 }