764cb2d32a
* Incomplete scraps * Add progress on new fork choice impl * Further progress * First complete compiling version * Remove chain reference * Add new lmd_ghost crate * Start integrating into beacon chain * Update `milagro_bls` to new release (#1183) * Update milagro_bls to new release Signed-off-by: Kirk Baird <baird.k@outlook.com> * Tidy up fake cryptos Signed-off-by: Kirk Baird <baird.k@outlook.com> * move SecretHash to bls and put plaintext back Signed-off-by: Kirk Baird <baird.k@outlook.com> * Update state processing for v0.12 * Fix EF test runners for v0.12 * Fix some tests * Fix broken attestation verification test * More test fixes * Rough beacon chain impl working * Remove fork_choice_2 * Remove checkpoint manager * Half finished ssz impl * Add missed file * Add persistence * Tidy, fix some compile errors * Remove RwLock from ProtoArrayForkChoice * Fix store-based compile errors * Add comments, tidy * Move function out of ForkChoice struct * Start testing * More testing * Fix compile error * Tidy beacon_chain::fork_choice * Queue attestations from the current slot * Allow fork choice to handle prior-to-genesis start * Improve error granularity * Test attestation dequeuing * Process attestations during block * Store target root in fork choice * Move fork choice verification into new crate * Update tests * Consensus updates for v0.12 (#1228) * Update state processing for v0.12 * Fix EF test runners for v0.12 * Fix some tests * Fix broken attestation verification test * More test fixes * Fix typo found in review * Add `Block` struct to ProtoArray * Start fixing get_ancestor * Add rough progress on testing * Get fork choice tests working * Progress with testing * Fix partialeq impl * Move slot clock from fc_store * Improve testing * Add testing for best justified * Add clone back to SystemTimeSlotClock * Add balances test * Start adding balances cache again * Wire-in balances cache * Improve tests * Remove commented-out tests * Remove beacon_chain::ForkChoice * Rename crates * Update wider codebase to new fork_choice layout * Move advance_slot in test harness * Tidy ForkChoice::update_time * Fix verification tests * Fix compile error with iter::once * Fix fork choice tests * Ensure block attestations are processed * Fix failing beacon_chain tests * Add first invalid block check * Add finalized block check * Progress with testing, new store builder * Add fixes to get_ancestor * Fix old genesis justification test * Fix remaining fork choice tests * Change root iteration method * Move on_verified_block * Remove unused method * Start adding attestation verification tests * Add invalid ffg target test * Add target epoch test * Add queued attestation test * Remove old fork choice verification tests * Tidy, add test * Move fork choice lock drop * Rename BeaconForkChoiceStore * Add comments, tidy BeaconForkChoiceStore * Update metrics, rename fork_choice_store.rs * Remove genesis_block_root from ForkChoice * Tidy * Update fork_choice comments * Tidy, add comments * Tidy, simplify ForkChoice, fix compile issue * Tidy, removed dead file * Increase http request timeout * Fix failing rest_api test * Set HTTP timeout back to 5s * Apply fix to get_ancestor * Address Michael's comments * Fix typo * Revert "Fix broken attestation verification test" This reverts commit 722cdc903b12611de27916a57eeecfa3224f2279. Co-authored-by: Kirk Baird <baird.k@outlook.com> Co-authored-by: Michael Sproul <michael@sigmaprime.io>
126 lines
3.7 KiB
Rust
126 lines
3.7 KiB
Rust
use super::{ManualSlotClock, SlotClock};
|
|
use std::time::{Duration, SystemTime, UNIX_EPOCH};
|
|
use types::Slot;
|
|
|
|
pub use std::time::SystemTimeError;
|
|
|
|
/// Determines the present slot based upon the present system time.
|
|
#[derive(Clone)]
|
|
pub struct SystemTimeSlotClock {
|
|
clock: ManualSlotClock,
|
|
}
|
|
|
|
impl SlotClock for SystemTimeSlotClock {
|
|
fn new(genesis_slot: Slot, genesis_duration: Duration, slot_duration: Duration) -> Self {
|
|
Self {
|
|
clock: ManualSlotClock::new(genesis_slot, genesis_duration, slot_duration),
|
|
}
|
|
}
|
|
|
|
fn now(&self) -> Option<Slot> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
self.clock.slot_of(now)
|
|
}
|
|
|
|
fn is_prior_to_genesis(&self) -> Option<bool> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
Some(now < *self.clock.genesis_duration())
|
|
}
|
|
|
|
fn now_duration(&self) -> Option<Duration> {
|
|
SystemTime::now().duration_since(UNIX_EPOCH).ok()
|
|
}
|
|
|
|
fn slot_of(&self, now: Duration) -> Option<Slot> {
|
|
self.clock.slot_of(now)
|
|
}
|
|
|
|
fn duration_to_next_slot(&self) -> Option<Duration> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
self.clock.duration_to_next_slot_from(now)
|
|
}
|
|
|
|
fn duration_to_next_epoch(&self, slots_per_epoch: u64) -> Option<Duration> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
self.clock.duration_to_next_epoch_from(now, slots_per_epoch)
|
|
}
|
|
|
|
fn slot_duration(&self) -> Duration {
|
|
self.clock.slot_duration()
|
|
}
|
|
|
|
fn duration_to_slot(&self, slot: Slot) -> Option<Duration> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
self.clock.duration_to_slot(slot, now)
|
|
}
|
|
|
|
fn genesis_slot(&self) -> Slot {
|
|
self.clock.genesis_slot()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
/*
|
|
* Note: these tests are using actual system times and could fail if they are executed on a
|
|
* very slow machine.
|
|
*/
|
|
#[test]
|
|
fn test_slot_now() {
|
|
let genesis_slot = Slot::new(0);
|
|
|
|
let prior_genesis = |milliseconds_prior: u64| {
|
|
SystemTime::now()
|
|
.duration_since(UNIX_EPOCH)
|
|
.expect("should get system time")
|
|
- Duration::from_millis(milliseconds_prior)
|
|
};
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(0), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(0)));
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(5_000), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(5)));
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(500), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(0)));
|
|
assert!(clock.duration_to_next_slot().unwrap() <= Duration::from_millis(500));
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(1_500), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(1)));
|
|
assert!(clock.duration_to_next_slot().unwrap() <= Duration::from_millis(500));
|
|
}
|
|
|
|
#[test]
|
|
#[should_panic]
|
|
fn zero_seconds() {
|
|
SystemTimeSlotClock::new(Slot::new(0), Duration::from_secs(0), Duration::from_secs(0));
|
|
}
|
|
|
|
#[test]
|
|
#[should_panic]
|
|
fn zero_millis() {
|
|
SystemTimeSlotClock::new(
|
|
Slot::new(0),
|
|
Duration::from_secs(0),
|
|
Duration::from_millis(0),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
#[should_panic]
|
|
fn less_than_one_millis() {
|
|
SystemTimeSlotClock::new(
|
|
Slot::new(0),
|
|
Duration::from_secs(0),
|
|
Duration::from_nanos(999),
|
|
);
|
|
}
|
|
}
|