cerc-io/lighthouse
15
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix bug in Epoch.slot_iter()

Browse Source 
It wasn't running the whole range, plus it could get into a loop when
used near the u64::max_value
This commit is contained in:
Paul Hauner 2019-02-22 18:48:35 +13:00
parent 89ab0f683e
commit 7a28893bab
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eth2/types/src/slot_epoch.rs
View File

@ -72,7 +72,7 @@ impl Epoch {
pub fn slot_iter(&self, epoch_length: u64) -> SlotIter { pub fn slot_iter(&self, epoch_length: u64) -> SlotIter {
SlotIter { SlotIter {
current: self.start_slot(epoch_length), current_iteration: 0,
epoch: self, epoch: self,
epoch_length, epoch_length,
} }
@ -80,7 +80,7 @@ impl Epoch {
} }
pub struct SlotIter<'a> { pub struct SlotIter<'a> {
current: Slot, current_iteration: u64,
epoch: &'a Epoch, epoch: &'a Epoch,
epoch_length: u64, epoch_length: u64,
} }
@ -89,12 +89,13 @@ impl<'a> Iterator for SlotIter<'a> {
type Item = Slot; type Item = Slot;
fn next(&mut self) -> Option<Slot> { fn next(&mut self) -> Option<Slot> {
if self.current == self.epoch.end_slot(self.epoch_length) { if self.current_iteration >= self.epoch_length {
None None
} else { } else {
let previous = self.current; let start_slot = self.epoch.start_slot(self.epoch_length);
self.current += 1; let previous = self.current_iteration;
Some(previous) self.current_iteration += 1;
Some(start_slot + previous)
} }
} }
} }
@ -115,4 +116,22 @@ mod epoch_tests {
use ssz::ssz_encode; use ssz::ssz_encode;
all_tests!(Epoch); all_tests!(Epoch);
#[test]
fn slot_iter() {
let epoch_length = 8;
let epoch = Epoch::new(0);
let mut slots = vec![];
for slot in epoch.slot_iter(epoch_length) {
slots.push(slot);
}
assert_eq!(slots.len(), epoch_length as usize);
for i in 0..epoch_length {
assert_eq!(Slot::from(i), slots[i as usize])
}
}
} }