gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-14 18:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add BeaconBlocksByRange v3"

Browse Source 
This reverts commit e3ce7fc5ea.
This commit is contained in:
dapplion
2024-07-15 18:01:06 +02:00
parent e3ce7fc5ea
commit 9f40d91d51
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/network/src/sync/block_lookups/mod.rs
View File

@@ -53,7 +53,7 @@ mod tests;
/// The maximum depth we will search for a parent block. In principle we should have sync'd any
/// canonical chain to its head once the peer connects. A chain should not appear where it's depth
/// is further back than the most recent head slot.
pub(crate) const PARENT_DEPTH_TOLERANCE: usize = SLOT_IMPORT_TOLERANCE + 1;
pub(crate) const PARENT_DEPTH_TOLERANCE: usize = SLOT_IMPORT_TOLERANCE * 2;
const FAILED_CHAINS_CACHE_EXPIRY_SECONDS: u64 = 60;
pub const SINGLE_BLOCK_LOOKUP_MAX_ATTEMPTS: u8 = 4;

12
beacon_node/network/src/sync/range_sync/chain.rs
View File

@@ -11,7 +11,6 @@ use rand::{seq::SliceRandom, Rng};
use slog::{crit, debug, o, warn};
use std::collections::{btree_map::Entry, BTreeMap, HashSet};
use std::hash::{Hash, Hasher};
use std::time::Instant;
use types::{Epoch, EthSpec, Hash256, Slot};
/// Blocks are downloaded in batches from peers. This constant specifies how many epochs worth of
@@ -110,9 +109,6 @@ pub struct SyncingChain<T: BeaconChainTypes> {
pub enum ChainSyncingState {
/// The chain is not being synced.
Stopped,
/// The chain should not download any more batches, but should attempt to processing everything
/// that is already downloaded.
Stopping(Instant),
/// The chain is undergoing syncing.
Syncing,
}
@@ -870,11 +866,6 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
network: &mut SyncNetworkContext<T>,
batch_id: BatchId,
) -> ProcessingResult {
// If chain is stopping do not request any more batches.
if matches!(self.state, ChainSyncingState::Stopping) {
return Ok(KeepChain);
}
let Some(batch) = self.batches.get_mut(&batch_id) else {
return Ok(KeepChain);
};
@@ -981,7 +972,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
pub fn is_syncing(&self) -> bool {
match self.state {
ChainSyncingState::Syncing => true,
ChainSyncingState::Stopped | ChainSyncingState::Stopping { .. } => false,
ChainSyncingState::Stopped => false,
}
}
@@ -1000,7 +991,6 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
/// Attempts to request the next required batches from the peer pool if the chain is syncing. It will exhaust the peer
/// pool and left over batches until the batch buffer is reached or all peers are exhausted.
fn request_batches(&mut self, network: &mut SyncNetworkContext<T>) -> ProcessingResult {
// If chain is stopped or stopping do not request any more batches.
if !matches!(self.state, ChainSyncingState::Syncing) {
return Ok(KeepChain);
}