refactor: avoid cloning immutable values (#1995)

Author: maximopalopoli

crates/cli/src/main.rs

@@ -541,33 +541,33 @@ async fn main() -> Result<(), AlignedError> {
             let chain_id = get_chain_id(eth_rpc_url.as_str()).await?;
             wallet = wallet.with_chain_id(chain_id);
 
+            let used_network: Network = submit_args.network.clone().into();
+
             let nonce = match &submit_args.nonce {
                 Some(nonce) => U256::from_dec_str(nonce).map_err(|_| SubmitError::InvalidNonce)?,
-                None => {
-                    get_nonce_from_batcher(submit_args.network.clone().into(), wallet.address())
-                        .await
-                        .map_err(|e| match e {
-                            aligned_sdk::common::errors::GetNonceError::EthRpcError(e) => {
-                                SubmitError::GetNonceError(e)
-                            }
-                            aligned_sdk::common::errors::GetNonceError::ConnectionFailed(e) => {
-                                SubmitError::GenericError(e)
-                            }
-                            aligned_sdk::common::errors::GetNonceError::InvalidRequest(e) => {
-                                SubmitError::GenericError(e)
-                            }
-                            aligned_sdk::common::errors::GetNonceError::SerializationError(e) => {
-                                SubmitError::GenericError(e)
-                            }
-                            aligned_sdk::common::errors::GetNonceError::ProtocolMismatch {
-                                current,
-                                expected,
-                            } => SubmitError::ProtocolVersionMismatch { current, expected },
-                            aligned_sdk::common::errors::GetNonceError::UnexpectedResponse(e) => {
-                                SubmitError::UnexpectedBatcherResponse(e)
-                            }
-                        })?
-                }
+                None => get_nonce_from_batcher(used_network.clone(), wallet.address())
+                    .await
+                    .map_err(|e| match e {
+                        aligned_sdk::common::errors::GetNonceError::EthRpcError(e) => {
+                            SubmitError::GetNonceError(e)
+                        }
+                        aligned_sdk::common::errors::GetNonceError::ConnectionFailed(e) => {
+                            SubmitError::GenericError(e)
+                        }
+                        aligned_sdk::common::errors::GetNonceError::InvalidRequest(e) => {
+                            SubmitError::GenericError(e)
+                        }
+                        aligned_sdk::common::errors::GetNonceError::SerializationError(e) => {
+                            SubmitError::GenericError(e)
+                        }
+                        aligned_sdk::common::errors::GetNonceError::ProtocolMismatch {
+                            current,
+                            expected,
+                        } => SubmitError::ProtocolVersionMismatch { current, expected },
+                        aligned_sdk::common::errors::GetNonceError::UnexpectedResponse(e) => {
+                            SubmitError::UnexpectedBatcherResponse(e)
+                        }
+                    })?,
             };
 
             warn!("Nonce: {nonce}");
@@ -587,10 +587,10 @@ async fn main() -> Result<(), AlignedError> {
             info!("Submitting proofs to the Aligned batcher...");
 
             let aligned_verification_data_vec = submit_multiple(
-                submit_args.network.clone().into(),
+                used_network.clone(),
                 &verification_data_arr,
                 max_fee_wei,
-                wallet.clone(),
+                wallet,
                 nonce,
             )
             .await;
@@ -625,7 +625,7 @@ async fn main() -> Result<(), AlignedError> {
             }
 
             for batch_merkle_root in unique_batch_merkle_roots {
-                let base_url = match submit_args.network.clone().into() {
+                let base_url = match used_network {
                     Network::Holesky => "https://holesky.explorer.alignedlayer.com/batches/0x",
                     Network::HoleskyStage => "https://stage.explorer.alignedlayer.com/batches/0x",
                     Network::Mainnet => "https://explorer.alignedlayer.com/batches/0x",
@@ -725,7 +725,7 @@ async fn main() -> Result<(), AlignedError> {
             let chain_id = get_chain_id(eth_rpc_url.as_str()).await?;
             wallet = wallet.with_chain_id(chain_id);
 
-            let client = SignerMiddleware::new(eth_rpc_provider.clone(), wallet.clone());
+            let client = SignerMiddleware::new(eth_rpc_provider, wallet);
 
             match deposit_to_aligned(amount_wei, client, deposit_to_batcher_args.network.into())
                 .await
@@ -777,8 +777,7 @@ async fn main() -> Result<(), AlignedError> {
         }
         GetUserNonceFromEthereum(args) => {
             let address = H160::from_str(&args.address).unwrap();
-            let network = args.network.into();
-            match get_nonce_from_ethereum(&args.eth_rpc_url, address, network).await {
+            match get_nonce_from_ethereum(&args.eth_rpc_url, address, args.network.into()).await {
                 Ok(nonce) => {
                     info!(
                         "Nonce for address {} in BatcherPaymentService contract is {}",

crates/sdk/src/verification_layer/mod.rs

@@ -470,9 +470,7 @@ async fn _is_proof_verified(
         .flatten()
         .collect();
 
-    let verification_data_comm = aligned_verification_data
-        .verification_data_commitment
-        .clone();
+    let verification_data_comm = &aligned_verification_data.verification_data_commitment;
 
     let service_manager = aligned_service_manager(eth_rpc_provider, contract_address).await?;
 

crates/task-sender/src/commands.rs

@@ -318,9 +318,9 @@ pub async fn send_infinite_proofs(args: SendInfiniteProofsArgs) {
     let network: Network = args.network.into();
     info!("Starting senders!");
     for (i, sender) in senders.iter().enumerate() {
+        // this clones are necessary because of the move
         let wallet = sender.wallet.clone();
         let verification_data = verification_data.clone();
-        // this is necessary because of the move
         let network_clone = network.clone();
 
         // a thread to send tasks from each loaded wallet:
@@ -347,11 +347,11 @@ pub async fn send_infinite_proofs(args: SendInfiniteProofsArgs) {
 
                 info!(
                     "Sending {:?} Proofs to Aligned Batcher on {:?} from sender {}, nonce: {}, address: {:?}",
-                    args.burst_size, n.clone(), i, nonce, wallet.address(),
+                    args.burst_size, n, i, nonce, wallet.address(),
                 );
 
                 let aligned_verification_data = submit_multiple(
-                    n.clone(),
+                    n,
                     &verification_data_to_send.clone(),
                     max_fee,
                     wallet.clone(),