Skip to content

Commit

Permalink
Clippy auto-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
poplexity committed Aug 5, 2024
1 parent d8f123d commit 49b11f4
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 21 deletions.
10 changes: 5 additions & 5 deletions src/arrow_block_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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()

Check failure on line 405 in src/arrow_block_reader.rs

View workflow job for this annotation

GitHub Actions / Clippy

called `unwrap` on `maybe_addr` after checking its variant with `is_some`
} else {
info!(
"address for index {} not in map, doing http query...",
Expand All @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
24 changes: 11 additions & 13 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
);
}
}
}
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/execution_api_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 49b11f4

Please sign in to comment.