poanetwork
/
hbbft
mirror of https://github.com/poanetwork/hbbft.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #173 from poanetwork/afck-hb-clear-cs 

Fix removal of terminated CS instances in HB.
This commit is contained in:
Vladimir Komendantskiy 2018-07-31 15:15:54 +01:00 committed by GitHub
parent 0e7055f8eb 8346085fb9
commit 062b7150e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/honey_badger.rs
View File

@ -307,7 +307,7 @@ where
.map_err(ErrorKind::HandleCommonMessageCommonSubset1)?
};
let step = self.process_output(cs_step, epoch)?;
self.remove_terminated(epoch);
self.remove_terminated();
Ok(step)
}
@ -613,20 +613,21 @@ where
}
/// Removes all `CommonSubset` instances from _past_ epochs that have terminated.
fn remove_terminated(&mut self, from_epoch: u64) {
for epoch in from_epoch..self.epoch {
if self
.common_subsets
.get(&epoch)
.map_or(false, CommonSubset::terminated)
{
debug!(
"{:?} Epoch {} has terminated.",
self.netinfo.our_uid(),
epoch
);
self.common_subsets.remove(&epoch);
}
fn remove_terminated(&mut self) {
let terminated_epochs: Vec<u64> = self
.common_subsets
.iter()
.take_while(|&(epoch, _)| *epoch < self.epoch)
.filter(|&(_, cs)| cs.terminated())
.map(|(epoch, _)| *epoch)
.collect();
for epoch in terminated_epochs {
debug!(
"{:?} Epoch {} has terminated.",
self.netinfo.our_uid(),
epoch
);
self.common_subsets.remove(&epoch);
}
}
}