Merge branch 'kill-grpc' into eth1-deploy

This commit is contained in:
Paul Hauner
2019-11-25 15:18:47 +11:00
11 changed files with 41 additions and 53 deletions

View File

@@ -39,7 +39,7 @@ impl SlotClock for TestingSlotClock {
/// Always returns a duration of `1 * slots_per_epoch` second.
fn duration_to_next_epoch(&self, slots_per_epoch: u64) -> Option<Duration> {
Some(Duration::from_secs(1 + slots_per_epoch))
Some(Duration::from_secs(slots_per_epoch))
}
/// Always returns a slot duration of 0 seconds.