Add new fns to ForkChoice and SlotClock

eth2/utils/slot_clock/src/lib.rs

@@ -6,9 +6,14 @@ pub use crate::testing_slot_clock::{Error as TestingSlotClockError, TestingSlotC
 use std::time::Duration;
 pub use types::Slot;
 
-pub trait SlotClock: Send + Sync {
+pub trait SlotClock: Send + Sync + Sized {
     type Error;
 
+    /// Create a new `SlotClock`.
+    ///
+    /// Returns an Error if `slot_duration_seconds == 0`.
+    fn new(genesis_slot: Slot, genesis_seconds: u64, slot_duration_seconds: u64) -> Self;
+
     fn present_slot(&self) -> Result<Option<Slot>, Self::Error>;
 
     fn duration_to_next_slot(&self) -> Result<Option<Duration>, Self::Error>;

eth2/utils/slot_clock/src/system_time_slot_clock.rs

@@ -18,31 +18,25 @@ pub struct SystemTimeSlotClock {
     slot_duration_seconds: u64,
 }
 
-impl SystemTimeSlotClock {
-    /// Create a new `SystemTimeSlotClock`.
-    ///
-    /// Returns an Error if `slot_duration_seconds == 0`.
-    pub fn new(
-        genesis_slot: Slot,
-        genesis_seconds: u64,
-        slot_duration_seconds: u64,
-    ) -> Result<SystemTimeSlotClock, Error> {
-        if slot_duration_seconds == 0 {
-            Err(Error::SlotDurationIsZero)
-        } else {
-            Ok(Self {
-                genesis_slot,
-                genesis_seconds,
-                slot_duration_seconds,
-            })
-        }
-    }
-}
-
 impl SlotClock for SystemTimeSlotClock {
     type Error = Error;
 
+    /// Create a new `SystemTimeSlotClock`.
+    ///
+    /// Returns an Error if `slot_duration_seconds == 0`.
+    fn new(genesis_slot: Slot, genesis_seconds: u64, slot_duration_seconds: u64) -> Self {
+        Self {
+            genesis_slot,
+            genesis_seconds,
+            slot_duration_seconds,
+        }
+    }
+
     fn present_slot(&self) -> Result<Option<Slot>, Error> {
+        if self.slot_duration_seconds == 0 {
+            return Err(Error::SlotDurationIsZero);
+        }
+
         let syslot_time = SystemTime::now();
         let duration_since_epoch = syslot_time.duration_since(SystemTime::UNIX_EPOCH)?;
         let duration_since_genesis =

eth2/utils/slot_clock/src/testing_slot_clock.rs

@@ -8,30 +8,28 @@ pub enum Error {}
 
 /// Determines the present slot based upon the present system time.
 pub struct TestingSlotClock {
-    slot: RwLock<u64>,
+    slot: RwLock<Slot>,
 }
 
 impl TestingSlotClock {
-    /// Create a new `TestingSlotClock`.
-    ///
-    /// Returns an Error if `slot_duration_seconds == 0`.
-    pub fn new(slot: u64) -> TestingSlotClock {
-        TestingSlotClock {
-            slot: RwLock::new(slot),
-        }
-    }
-
     pub fn set_slot(&self, slot: u64) {
-        *self.slot.write().expect("TestingSlotClock poisoned.") = slot;
+        *self.slot.write().expect("TestingSlotClock poisoned.") = Slot::from(slot);
     }
 }
 
 impl SlotClock for TestingSlotClock {
     type Error = Error;
 
+    /// Create a new `TestingSlotClock` at `genesis_slot`.
+    fn new(genesis_slot: Slot, _genesis_seconds: u64, _slot_duration_seconds: u64) -> Self {
+        TestingSlotClock {
+            slot: RwLock::new(genesis_slot),
+        }
+    }
+
     fn present_slot(&self) -> Result<Option<Slot>, Error> {
         let slot = *self.slot.read().expect("TestingSlotClock poisoned.");
-        Ok(Some(Slot::new(slot)))
+        Ok(Some(slot))
     }
 
     /// Always returns a duration of 1 second.
@@ -46,7 +44,9 @@ mod tests {
 
     #[test]
     fn test_slot_now() {
-        let clock = TestingSlotClock::new(10);
+        let null = 0;
+
+        let clock = TestingSlotClock::new(Slot::new(10), null, null);
         assert_eq!(clock.present_slot(), Ok(Some(Slot::new(10))));
         clock.set_slot(123);
         assert_eq!(clock.present_slot(), Ok(Some(Slot::new(123))));