mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-06 10:11:44 +00:00
Replace INTERVALS_PER_SLOT with explicit slot component times (#7944)
https://github.com/ethereum/consensus-specs/pull/4476 Co-Authored-By: Barnabas Busa <barnabas.busa@ethereum.org> Co-Authored-By: Eitan Seri- Levi <eserilev@gmail.com> Co-Authored-By: Eitan Seri-Levi <eserilev@ucsc.edu> Co-Authored-By: Michael Sproul <michaelsproul@users.noreply.github.com> Co-Authored-By: Michael Sproul <michael@sigmaprime.io>
This commit is contained in:
@@ -102,7 +102,7 @@ pub fn cli_run<E: EthSpec>(matches: &ArgMatches, env: Environment<E>) -> Result<
|
||||
let client = BeaconNodeHttpClient::new(
|
||||
SensitiveUrl::parse(&server_url)
|
||||
.map_err(|e| format!("Failed to parse beacon http server: {:?}", e))?,
|
||||
Timeouts::set_all(Duration::from_secs(env.eth2_config.spec.seconds_per_slot)),
|
||||
Timeouts::set_all(env.eth2_config.spec.get_slot_duration()),
|
||||
);
|
||||
|
||||
let eth2_network_config = env
|
||||
@@ -230,7 +230,7 @@ async fn publish_voluntary_exit<E: EthSpec>(
|
||||
loop {
|
||||
// Sleep for a slot duration and then check if voluntary exit was processed
|
||||
// by checking the validator status.
|
||||
sleep(Duration::from_secs(spec.seconds_per_slot)).await;
|
||||
sleep(spec.get_slot_duration()).await;
|
||||
|
||||
let validator_data = get_validator_data(client, &keypair.pk).await?;
|
||||
match validator_data.status {
|
||||
@@ -251,7 +251,9 @@ async fn publish_voluntary_exit<E: EthSpec>(
|
||||
eprintln!("Please keep your validator running till exit epoch");
|
||||
eprintln!(
|
||||
"Exit epoch in approximately {} secs",
|
||||
(exit_epoch - current_epoch) * spec.seconds_per_slot * E::slots_per_epoch()
|
||||
(exit_epoch - current_epoch)
|
||||
* spec.get_slot_duration().as_secs()
|
||||
* E::slots_per_epoch()
|
||||
);
|
||||
break;
|
||||
}
|
||||
@@ -350,7 +352,7 @@ fn get_current_epoch<E: EthSpec>(genesis_time: u64, spec: &ChainSpec) -> Option<
|
||||
let slot_clock = SystemTimeSlotClock::new(
|
||||
spec.genesis_slot,
|
||||
Duration::from_secs(genesis_time),
|
||||
Duration::from_secs(spec.seconds_per_slot),
|
||||
spec.get_slot_duration(),
|
||||
);
|
||||
slot_clock.now().map(|s| s.epoch(E::slots_per_epoch()))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user