diff --git a/crates/bsc/consensus/src/client.rs b/crates/bsc/consensus/src/client.rs index b50a5eee0..5cbbd677a 100644 --- a/crates/bsc/consensus/src/client.rs +++ b/crates/bsc/consensus/src/client.rs @@ -108,10 +108,10 @@ impl HeadersClient for ParliaClient { let this = self.clone(); Box::pin(async move { let result = this.fetch_headers(request.clone()).await; - if !result.is_err() { + if result.is_ok() { let headers = result.clone().unwrap(); if headers.len() as u64 == request.limit { - return Ok(WithPeerId::new(PeerId::random(), headers.clone())); + return Ok(WithPeerId::new(PeerId::random(), headers)); } } this.fetch_client.get_headers_with_priority(request.clone(), priority).await @@ -130,8 +130,8 @@ impl BodiesClient for ParliaClient { let this = self.clone(); Box::pin(async move { let result = this.fetch_bodies(hashes.clone()).await; - if !result.is_err() { - return Ok(WithPeerId::new(PeerId::random(), result.unwrap().clone())); + if result.is_ok() { + return Ok(WithPeerId::new(PeerId::random(), result.unwrap())); } this.fetch_client.get_block_bodies_with_priority(hashes.clone(), priority).await }) diff --git a/crates/bsc/consensus/src/lib.rs b/crates/bsc/consensus/src/lib.rs index d12e59b38..5d78ad066 100644 --- a/crates/bsc/consensus/src/lib.rs +++ b/crates/bsc/consensus/src/lib.rs @@ -626,7 +626,7 @@ impl ParliaEngineBuilder let parlia_client = ParliaClient::new(storage.clone(), fetch_client); let task = ParliaEngineTask::new( chain_spec.clone(), - Parlia::new(chain_spec.clone(), cfg), + Parlia::new(chain_spec, cfg), to_engine, network_block_event_rx, storage, @@ -766,7 +766,7 @@ impl LimitedHashSet } fn get(&self, key: &K) -> Option<&V> { - self.map.get(key).map(|v| v) + self.map.get(key) } fn iter(&self) -> impl Iterator { diff --git a/crates/bsc/consensus/src/task.rs b/crates/bsc/consensus/src/task.rs index a2f00177f..8f72d47cb 100644 --- a/crates/bsc/consensus/src/task.rs +++ b/crates/bsc/consensus/src/task.rs @@ -121,12 +121,12 @@ impl ParliaEngineTask { EngineMessage::NewBlockHashes(event) => match event.hashes.last() { None => continue, Some(block_hash) => { - info.block_hash = BlockHashOrNumber::Hash(block_hash.hash.clone()); + info.block_hash = BlockHashOrNumber::Hash(block_hash.hash); info.block_number = block_hash.number; } }, EngineMessage::NewBlock(event) => { - info.block_hash = BlockHashOrNumber::Hash(event.hash.clone()); + info.block_hash = BlockHashOrNumber::Hash(event.hash); info.block_number = event.block.block.number; info.block = Some(event.block.block.clone()); } @@ -164,7 +164,7 @@ impl ParliaEngineTask { debug!(target: "consensus::parlia", { block_hash = ?info.block_hash }, "Fetching new header"); // fetch header and verify let fetch_header_result = block_fetcher - .get_header_with_priority(info.block_hash.into(), Priority::High) + .get_header_with_priority(info.block_hash, Priority::High) .await; if fetch_header_result.is_err() { trace!(target: "consensus::parlia", "Failed to fetch header"); @@ -229,7 +229,7 @@ impl ParliaEngineTask { ForkChoiceMessage::NewBlock(event) => { // notify beacon engine let state = ForkchoiceState { - head_block_hash: event.hash.clone(), + head_block_hash: event.hash, // safe(justified) and finalized hash will be determined in the parlia consensus engine and stored in the snapshot after the block sync safe_block_hash: B256::ZERO, finalized_block_hash: B256::ZERO, diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs index a76238a6a..4f81503f0 100644 --- a/crates/config/src/config.rs +++ b/crates/config/src/config.rs @@ -1,5 +1,4 @@ //! Configuration files. -#[cfg(feature = "bsc")] use reth_primitives::parlia::ParliaConfig; use reth_network::{PeersConfig, SessionsConfig}; use reth_prune_types::PruneModes; diff --git a/crates/net/network/src/manager.rs b/crates/net/network/src/manager.rs index d5c52e7b1..7f6386e4d 100644 --- a/crates/net/network/src/manager.rs +++ b/crates/net/network/src/manager.rs @@ -258,7 +258,7 @@ where Arc::clone(&num_active_peers), Arc::new(Mutex::new(listener_addr)), to_manager_tx, - mutex_engine_rx.clone(), + mutex_engine_rx, secret_key, local_peer_id, peers_handle, @@ -538,7 +538,7 @@ where self.swarm.state_mut().on_new_block_hashes(peer_id, hashes.clone().0); // notify task engine self.notify_engine_task(EngineMessage::NewBlockHashes(BlockHashesEvent{ - hashes: hashes.clone().into(), + hashes: hashes.into(), })); } #[cfg(feature = "bsc")] @@ -548,8 +548,8 @@ where self.block_import.on_new_block(peer_id, block.clone()); // notify task engine self.notify_engine_task(EngineMessage::NewBlock(BlockEvent{ - hash: block.hash.clone(), - block: block.block.clone(), + hash: block.hash, + block: block.block, })); } PeerMessage::PooledTransactions(msg) => { diff --git a/crates/net/network/src/message.rs b/crates/net/network/src/message.rs index 66b919b74..ec9e3f0a7 100644 --- a/crates/net/network/src/message.rs +++ b/crates/net/network/src/message.rs @@ -342,7 +342,7 @@ impl fmt::Debug for PeerRequestSender { } } -/// All message variants that can be sent to TaskEngine. +/// All message variants that can be sent to `TaskEngine`. #[derive(Debug)] pub enum EngineMessage { /// Announce new block hashes diff --git a/crates/net/network/src/metrics.rs b/crates/net/network/src/metrics.rs index 7402ade8c..d859ccdc4 100644 --- a/crates/net/network/src/metrics.rs +++ b/crates/net/network/src/metrics.rs @@ -12,7 +12,7 @@ pub(crate) const NETWORK_POOL_TRANSACTIONS_SCOPE: &str = "network.pool.transacti /// Scope for monitoring transactions sent from the manager to the tx manager pub(crate) const NETWORK_PEER_SCOPE: &str = "network.peer.message"; -/// Metrics for the entire network, handled by NetworkManager +/// Metrics for the entire network, handled by `NetworkManager` #[derive(Metrics)] #[metrics(scope = "network")] pub struct NetworkMetrics { diff --git a/crates/net/network/src/network.rs b/crates/net/network/src/network.rs index 5d29c2f8f..57a9703a7 100644 --- a/crates/net/network/src/network.rs +++ b/crates/net/network/src/network.rs @@ -96,7 +96,7 @@ impl NetworkHandle { /// Returns a sharable [`UnboundedReceiver`] that can be cloned and shared. /// - /// The Engine message is used to communicate between the network and the EngineTask. + /// The Engine message is used to communicate between the network and the `EngineTask`. pub fn get_to_engine_rx(&self) -> Arc>> { self.inner.engine_rx.clone() } diff --git a/crates/node/builder/src/launch/mod.rs b/crates/node/builder/src/launch/mod.rs index 92e02f4d9..8f0229526 100644 --- a/crates/node/builder/src/launch/mod.rs +++ b/crates/node/builder/src/launch/mod.rs @@ -304,7 +304,7 @@ where (pipeline, Either::Right(client)) } - #[cfg(all(not(feature = "bsc")))] + #[cfg(not(feature = "bsc"))] { let pipeline = crate::setup::build_networked_pipeline( &ctx.toml_config().stages,