gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 20:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-05-22 17:35:31 +03:00
parent 6058760903 60abd4b5b9
commit c230bebf26
235 changed files with 3207 additions and 2277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
beacon_node/client/src/builder.rs
View File

@@ -37,6 +37,7 @@ use rand::SeedableRng;
use rand::rngs::{OsRng, StdRng};
use slasher::Slasher;
use slasher_service::SlasherService;
use std::num::NonZeroUsize;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::time::Duration;
@@ -98,8 +99,8 @@ impl<TSlotClock, E, THotStore, TColdStore>
where
TSlotClock: SlotClock + Clone + 'static,
E: EthSpec + 'static,
THotStore: ItemStore<E> + 'static,
TColdStore: ItemStore<E> + 'static,
THotStore: ItemStore + 'static,
TColdStore: ItemStore + 'static,
{
/// Instantiates a new, empty builder.
///
@@ -640,6 +641,10 @@ where
network_globals: self.network_globals.clone(),
beacon_processor_send: Some(beacon_processor_channels.beacon_processor_tx.clone()),
sse_logging_components: runtime_context.sse_logging_components.clone(),
historical_committee_cache: Arc::new(http_api::HistoricalCommitteeCache::new(
NonZeroUsize::new(self.http_api_config.historical_committee_cache_size)
.unwrap_or(NonZeroUsize::MIN),
)),
});
let exit = runtime_context.executor.exit();
@@ -815,8 +820,8 @@ impl<TSlotClock, E, THotStore, TColdStore>
where
TSlotClock: SlotClock + Clone + 'static,
E: EthSpec + 'static,
THotStore: ItemStore<E> + 'static,
TColdStore: ItemStore<E> + 'static,
THotStore: ItemStore + 'static,
TColdStore: ItemStore + 'static,
{
/// Consumes the internal `BeaconChainBuilder`, attaching the resulting `BeaconChain` to self.
#[instrument(skip_all)]
@@ -847,8 +852,7 @@ where
}
}
impl<TSlotClock, E>
ClientBuilder<Witness<TSlotClock, E, BeaconNodeBackend<E>, BeaconNodeBackend<E>>>
impl<TSlotClock, E> ClientBuilder<Witness<TSlotClock, E, BeaconNodeBackend, BeaconNodeBackend>>
where
TSlotClock: SlotClock + 'static,
E: EthSpec + 'static,
@@ -889,8 +893,8 @@ where
impl<E, THotStore, TColdStore> ClientBuilder<Witness<SystemTimeSlotClock, E, THotStore, TColdStore>>
where
E: EthSpec + 'static,
THotStore: ItemStore<E> + 'static,
TColdStore: ItemStore<E> + 'static,
THotStore: ItemStore + 'static,
TColdStore: ItemStore + 'static,
{
/// Specifies that the slot clock should read the time from the computers system clock.
pub fn system_time_slot_clock(mut self) -> Result<Self, String> {