Lint

Author: cytadela8

core/node/node_sync/src/batch_status_updater/mod.rs

@@ -212,15 +212,13 @@ impl L1TransactionVerifier {
                 let batch_hash = parsed_log.params.iter().find_map(|param| {
                     (param.name == "batchHash")
                         .then_some(param.value.clone())
-                        .and_then(ethabi::Token::into_fixed_bytes)
-                        .and_then(|bytes| Some(H256::from_slice(&bytes)))
+                        .and_then(ethabi::Token::into_fixed_bytes).map(|bytes| H256::from_slice(&bytes))
                 }).expect("Missing expected `batchHash` parameter in `BlockCommit` event log");
 
                 let commitment = parsed_log.params.into_iter().find_map(|param| {
                     (param.name == "commitment")
                         .then_some(param.value)
-                        .and_then(ethabi::Token::into_fixed_bytes)
-                        .and_then(|bytes| Some(H256::from_slice(&bytes)))
+                        .and_then(ethabi::Token::into_fixed_bytes).map(|bytes| H256::from_slice(&bytes))
                 }).expect("Missing expected `commitment` parameter in `BlockCommit` event log");
 
                 tracing::debug!(
@@ -260,7 +258,7 @@ impl L1TransactionVerifier {
                 "Commit transaction {commit_tx_hash} for batch {} does not have `BlockCommit` event log",
                 batch_number
             );
-            return Err(err);
+            Err(err)
         }
     }
 
@@ -355,7 +353,7 @@ impl L1TransactionVerifier {
                 "Prove transaction {prove_tx_hash} for batch {} does not have `BlocksVerification` event log",
                 batch_number
             );
-            return Err(err);
+            Err(err)
         }
     }
 
@@ -434,15 +432,13 @@ impl L1TransactionVerifier {
                 let batch_hash = parsed_log.params.iter().find_map(|param| {
                     (param.name == "batchHash")
                         .then_some(param.value.clone())
-                        .and_then(ethabi::Token::into_fixed_bytes)
-                        .and_then(|bytes| Some(H256::from_slice(&bytes)))
+                        .and_then(ethabi::Token::into_fixed_bytes).map(|bytes| H256::from_slice(&bytes))
                 }).expect("Missing expected `batchHash` parameter in `BlockExecution` event log");
 
                 let commitment = parsed_log.params.into_iter().find_map(|param| {
                     (param.name == "commitment")
                         .then_some(param.value)
-                        .and_then(ethabi::Token::into_fixed_bytes)
-                        .and_then(|bytes| Some(H256::from_slice(&bytes)))
+                        .and_then(ethabi::Token::into_fixed_bytes).map(|bytes| H256::from_slice(&bytes))
                 }).expect("Missing expected `commitment` parameter in `BlockExecution` event log");
 
                 tracing::debug!(
@@ -482,7 +478,7 @@ impl L1TransactionVerifier {
                 "Execute transaction {execute_tx_hash} for batch {} does not have the corresponding `BlockExecution` event log",
                 batch_number
             );
-            return Err(err);
+            Err(err)
         }
     }
 }
@@ -543,7 +539,7 @@ impl UpdaterCursor {
                         ));
                     }
                     // Validate the commit transaction against the database.
-                    let _ = l1_transaction_verifier
+                    l1_transaction_verifier
                         .validate_commit_tx_against_db(commit_tx_hash, batch_info.number)
                         .await
                         .context("Failed to validate commit transaction against the database")?;
@@ -566,7 +562,7 @@ impl UpdaterCursor {
                         ));
                     }
                     // Validate the prove transaction events.
-                    let _ = l1_transaction_verifier
+                    l1_transaction_verifier
                         .validate_prove_tx(prove_tx_hash, batch_info.number)
                         .await
                         .context("Failed to validate prove transaction")?;
@@ -590,7 +586,7 @@ impl UpdaterCursor {
                         ));
                     }
                     // Validate the execute transaction events.
-                    let _ = l1_transaction_verifier
+                    l1_transaction_verifier
                         .validate_execute_tx(execute_tx_hash, batch_info.number)
                         .await
                         .context("Failed to validate execute transaction")?;

core/node/node_sync/src/batch_status_updater/tests.rs

@@ -9,8 +9,8 @@ use zksync_contracts::BaseSystemContractsHashes;
 use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
 use zksync_node_test_utils::{create_l1_batch, create_l2_block, prepare_recovery_snapshot};
 use zksync_types::{
-    web3::{self, Bytes, Log, TransactionReceipt},
-    L2BlockNumber, U256,
+    web3::{TransactionReceipt},
+    L2BlockNumber,
 };
 
 use super::*;