From 3e854ae2d12292fa8e5340aa2c8b5e91e7e344d3 Mon Sep 17 00:00:00 2001 From: realbigsean Date: Fri, 21 Apr 2023 16:57:53 -0400 Subject: [PATCH] fix compile --- .../beacon_chain/src/blob_verification.rs | 1 - .../src/data_availability_checker.rs | 4 +--- .../beacon_processor/worker/gossip_methods.rs | 1 - .../src/beacon_processor/worker/sync_methods.rs | 2 +- .../network/src/sync/block_lookups/mod.rs | 17 +++++------------ .../src/sync/block_lookups/parent_lookup.rs | 3 --- beacon_node/store/src/hot_cold_store.rs | 2 +- 7 files changed, 8 insertions(+), 22 deletions(-) diff --git a/beacon_node/beacon_chain/src/blob_verification.rs b/beacon_node/beacon_chain/src/blob_verification.rs index 44c0879570..2c27bf527f 100644 --- a/beacon_node/beacon_chain/src/blob_verification.rs +++ b/beacon_node/beacon_chain/src/blob_verification.rs @@ -151,7 +151,6 @@ pub fn validate_blob_sidecar_for_gossip( ) -> Result, BlobError> { let blob_slot = signed_blob_sidecar.message.slot; let blob_index = signed_blob_sidecar.message.index; - let block_root = signed_blob_sidecar.message.block_root; let block_parent_root = signed_blob_sidecar.message.block_parent_root; let blob_proposer_index = signed_blob_sidecar.message.proposer_index; diff --git a/beacon_node/beacon_chain/src/data_availability_checker.rs b/beacon_node/beacon_chain/src/data_availability_checker.rs index 3a643824ad..668ac3fe37 100644 --- a/beacon_node/beacon_chain/src/data_availability_checker.rs +++ b/beacon_node/beacon_chain/src/data_availability_checker.rs @@ -151,9 +151,7 @@ impl DataAvailabilityChecker { .get(block_root) .map_or(vec![], |cache| { if let Some(block) = cache.executed_block.as_ref() { - block.get_filtered_blob_ids(|i, blob_root| { - cache.verified_blobs.get(i).is_none() - }) + block.get_filtered_blob_ids(|i, _| cache.verified_blobs.get(i).is_none()) } else { let mut blob_ids = Vec::with_capacity(T::max_blobs_per_block()); for i in 0..T::max_blobs_per_block() { diff --git a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs index 3d11d1c8e4..3ee3990e5e 100644 --- a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs +++ b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs @@ -1079,7 +1079,6 @@ impl Worker { ); None } - _ => todo!(), //TODO(sean) } } diff --git a/beacon_node/network/src/beacon_processor/worker/sync_methods.rs b/beacon_node/network/src/beacon_processor/worker/sync_methods.rs index b402153e59..9a2021ba33 100644 --- a/beacon_node/network/src/beacon_processor/worker/sync_methods.rs +++ b/beacon_node/network/src/beacon_processor/worker/sync_methods.rs @@ -146,7 +146,7 @@ impl Worker { Option>>, <::EthSpec as EthSpec>::MaxBlobsPerBlock, >, - seen_timestamp: Duration, + _seen_timestamp: Duration, process_type: BlockProcessType, ) { let Some(slot) = blobs.iter().find_map(|blob|{ diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs index 3dee1c3336..ff787869e8 100644 --- a/beacon_node/network/src/sync/block_lookups/mod.rs +++ b/beacon_node/network/src/sync/block_lookups/mod.rs @@ -7,7 +7,7 @@ use lru_cache::LRUTimeCache; use slog::{debug, error, trace, warn, Logger}; use smallvec::SmallVec; use ssz_types::FixedVector; -use std::collections::{HashMap, HashSet}; +use std::collections::HashMap; use std::sync::Arc; use std::time::Duration; use store::Hash256; @@ -26,7 +26,6 @@ use crate::beacon_processor::{ChainSegmentProcessId, WorkEvent}; use crate::metrics; use crate::sync::block_lookups::single_block_lookup::LookupVerifyError; -mod hg5e3wdtrfqa; mod parent_lookup; mod single_block_lookup; #[cfg(test)] @@ -122,7 +121,7 @@ impl BlockLookups { if self .single_block_lookups .iter_mut() - .any(|(block_id, blob_id, single_block_request)| { + .any(|(_, _, single_block_request)| { if single_block_request.requested_block_root == hash { single_block_request.block_request_state.add_peer(&peer_id); single_block_request.blob_request_state.add_peer(&peer_id); @@ -283,7 +282,6 @@ impl BlockLookups { // is complete before processing the block. if let Err(e) = request_ref.add_block(root, block) { Self::handle_block_lookup_verify_error( - id, peer_id, cx, request_id_ref, @@ -307,8 +305,7 @@ impl BlockLookups { } } Ok(None) => false, - Err(e) => Self::handle_blob_lookup_verify_error( - id, + Err(e) => Self::handle_block_lookup_verify_error( peer_id, cx, request_id_ref, @@ -353,7 +350,6 @@ impl BlockLookups { // is complete before processing the block. if let Err(e) = request_ref.add_blobs(block_root, blobs) { Self::handle_blob_lookup_verify_error( - id, peer_id, cx, request_id_ref, @@ -378,7 +374,6 @@ impl BlockLookups { } Ok(None) => false, Err(e) => Self::handle_blob_lookup_verify_error( - id, peer_id, cx, request_id_ref, @@ -401,7 +396,6 @@ impl BlockLookups { //TODO(sean) reduce duplicate code fn handle_block_lookup_verify_error( - id: Id, peer_id: PeerId, cx: &mut SyncNetworkContext, request_id_ref: &mut Id, @@ -436,7 +430,6 @@ impl BlockLookups { } fn handle_blob_lookup_verify_error( - id: Id, peer_id: PeerId, cx: &mut SyncNetworkContext, request_id_ref: &mut Id, @@ -512,7 +505,7 @@ impl BlockLookups { (triggered_parent_request, id_ref, req) } None => { - if matches!(StreamTerminator::False, stream_terminator) { + if matches!(stream_terminator, StreamTerminator::False,) { debug!( self.log, "Block returned for single block lookup not present"; @@ -803,7 +796,7 @@ impl BlockLookups { cx: &mut SyncNetworkContext, error: RPCError, ) { - // check if there's a pending blob response when deciding whether to drop + //TODO(sean) check if there's a pending blob response when deciding whether to drop? if let Some(pos) = self .parent_lookups diff --git a/beacon_node/network/src/sync/block_lookups/parent_lookup.rs b/beacon_node/network/src/sync/block_lookups/parent_lookup.rs index 2b095d58d6..5166d8fc29 100644 --- a/beacon_node/network/src/sync/block_lookups/parent_lookup.rs +++ b/beacon_node/network/src/sync/block_lookups/parent_lookup.rs @@ -7,16 +7,13 @@ use crate::sync::{ }; use beacon_chain::blob_verification::AsBlock; use beacon_chain::blob_verification::BlockWrapper; -use beacon_chain::data_availability_checker::AvailabilityCheckError; use beacon_chain::data_availability_checker::DataAvailabilityChecker; use beacon_chain::BeaconChainTypes; use lighthouse_network::PeerId; use ssz_types::FixedVector; -use std::iter; use std::sync::Arc; use store::Hash256; use strum::IntoStaticStr; -use types::blob_sidecar::BlobIdentifier; use types::{BlobSidecar, EthSpec, SignedBeaconBlock}; /// How many attempts we try to find a parent of a block before we give up trying. diff --git a/beacon_node/store/src/hot_cold_store.rs b/beacon_node/store/src/hot_cold_store.rs index 9613453779..42eb89abed 100644 --- a/beacon_node/store/src/hot_cold_store.rs +++ b/beacon_node/store/src/hot_cold_store.rs @@ -1917,7 +1917,7 @@ impl, Cold: ItemStore> HotColdDB && last_pruned_epoch.as_u64() + self.get_config().epochs_per_blob_prune > end_epoch.as_u64() { - info!(self.log, "Blobs sidecars are pruned"); + debug!(self.log, "Blobs sidecars are pruned"); return Ok(()); }