From 49b11f4fe2519be4153569993b5a66dff1f93c3e Mon Sep 17 00:00:00 2001
From: Jesse Schulman <jesse@caleos.io>
Date: Mon, 5 Aug 2024 13:59:20 -0700
Subject: [PATCH] Clippy auto-fixes

---
 src/arrow_block_reader.rs   | 10 +++++-----
 src/client.rs               | 24 +++++++++++-------------
 src/execution_api_client.rs |  2 +-
 src/main.rs                 |  3 +--
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/arrow_block_reader.rs b/src/arrow_block_reader.rs
index 00f4d65..65d8d31 100644
--- a/src/arrow_block_reader.rs
+++ b/src/arrow_block_reader.rs
@@ -98,7 +98,7 @@ pub struct AccountStateDelta {
 impl AccountStateDelta {
     pub fn to_reth_type(&self, addr: &Address) -> TelosAccountStateTableRow {
         TelosAccountStateTableRow {
-            address: addr.clone(),
+            address: *addr,
             key: U256::from_str_radix(&self.key, 16)
                 .expect("Could not parse key on account state delta"),
             value: U256::from_str_radix(&self.value, 16)
@@ -290,7 +290,7 @@ impl ArrowFileBlockReader {
                 let value = map.get(key).unwrap();
                 let record = AddressMapRecord {
                     index: *key,
-                    address: value.clone(),
+                    address: *value,
                 };
                 append_record_to_csv(&config.address_map, &record).unwrap();
             }
@@ -402,7 +402,7 @@ impl ArrowFileBlockReader {
                     let account_index = Name::new_from_str(&acc_state_delta.scope).n;
                     let maybe_addr = addr_map.get(&account_index);
                     let addr = if maybe_addr.is_some() {
-                        maybe_addr.unwrap().clone()
+                        *maybe_addr.unwrap()
                     } else {
                         info!(
                             "address for index {} not in map, doing http query...",
@@ -426,7 +426,7 @@ impl ArrowFileBlockReader {
                             })
                             .await
                             .unwrap();
-                        if account_result.rows.len() == 0 {
+                        if account_result.rows.is_empty() {
                             panic!("get_table_rows returned 0 rows!");
                         }
                         let address_checksum = account_result.rows[0].address;
@@ -526,7 +526,7 @@ impl ArrowFileBlockReader {
                 fee_recipient: Address::ZERO,
                 state_root: null_hash!(),
                 receipts_root: FixedBytes::from_hex(receipt_hash).unwrap(),
-                logs_bloom: Bloom::from_slice(&logs_bloom),
+                logs_bloom: Bloom::from_slice(logs_bloom),
                 prev_randao: Default::default(),
                 block_number: block_num,
                 gas_limit: 0x7fffffffu64,
diff --git a/src/client.rs b/src/client.rs
index e5871d9..c128bec 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -59,7 +59,7 @@ impl ConsensusClient {
             .to::<u64>()
             + 1;
         let mut batch_count = 0;
-        let mut last_block_number = std::cmp::min(
+        let last_block_number = std::cmp::min(
             self.reader
                 .get_latest_block()
                 .await
@@ -108,14 +108,12 @@ impl ConsensusClient {
                 );
                 // TODO: make this more live & fork aware
                 sleep(Duration::from_secs(5)).await;
-            } else {
-                if last_log_time.elapsed().as_secs() > 5 {
-                    last_log_time = std::time::Instant::now();
-                    info!(
-                        "Processed batch {}, up to block {}, sleeping for 1 second",
-                        batch_count, next_block_number
-                    );
-                }
+            } else if last_log_time.elapsed().as_secs() > 5 {
+                last_log_time = std::time::Instant::now();
+                info!(
+                    "Processed batch {}, up to block {}, sleeping for 1 second",
+                    batch_count, next_block_number
+                );
             }
         }
     }
@@ -198,16 +196,16 @@ impl ConsensusClient {
             finalized_block_hash: finalized_hash,
         };
 
-        let fork_choice_updated_result = self
+        
+
+        self
             .execution_api
             .rpc(RpcRequest {
                 method: crate::execution_api_client::ExecutionApiMethod::ForkChoiceUpdatedV1,
                 params: json![vec![fork_choice_state]],
             })
             .await
-            .unwrap();
-
-        fork_choice_updated_result
+            .unwrap()
     }
 
     async fn get_latest_executor_block(execution_api: &ExecutionApiClient) -> Block {
diff --git a/src/execution_api_client.rs b/src/execution_api_client.rs
index cef3c18..afbd4f7 100644
--- a/src/execution_api_client.rs
+++ b/src/execution_api_client.rs
@@ -77,7 +77,7 @@ impl ExecutionApiClient {
         &self,
         rpc_requests: Vec<RpcRequest>,
     ) -> Result<Vec<JsonResponseBody>, String> {
-        let mut counter = 0;
+        let counter = 0;
         const JSONRPC: &str = "2.0";
         let mut batch_requests = vec![];
         for rpc_request in rpc_requests {
diff --git a/src/main.rs b/src/main.rs
index 8b3ccff..fec2606 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,6 @@ use crate::client::ConsensusClient;
 use crate::config::{AppConfig, CliArgs};
 use arrowbatch::reader::{ArrowBatchConfig, ArrowBatchContext};
 use clap::Parser;
-use env_logger;
 
 mod arrow_block_reader;
 mod auth;
@@ -24,7 +23,7 @@ async fn main() {
         dump_size: 100_000_u64,
     };
 
-    let mut context = ArrowBatchContext::new(arrow_config);
+    let context = ArrowBatchContext::new(arrow_config);
     context.lock().unwrap().reload_on_disk_buckets();
 
     let mut client = ConsensusClient::new(config, context).await;