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

Fix joining, use JoinPlan::next_epoch. 

This fixes a panic because with the new `NodeChange` API,
`promote_to_validator` was also called in validators.
This commit is contained in:
Andreas Fackler 2018-11-19 11:03:22 +01:00 committed by Nick Sanders
parent eecab4c532
commit 963be89e14
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hydrabadger/handler.rs
View File

@ -352,6 +352,7 @@ impl<T: Contribution> Handler<T> {
info!("== INSTANTIATING HONEY BADGER ==");
match jp_opt {
Some(jp) => {
let epoch = jp.next_epoch();
iom_queue_opt = Some(state.set_observer(
*self.hdb.uid(),
self.hdb.secret_key().clone(),
@ -359,8 +360,7 @@ impl<T: Contribution> Handler<T> {
self.hdb.config(),
&self.step_queue,
)?);
let (era, epoch) = state.dhb().unwrap().epoch();
self.hdb.set_current_epoch(era + epoch);
self.hdb.set_current_epoch(epoch);
}
None => {
iom_queue_opt = Some(state.set_validator(
@ -761,7 +761,9 @@ impl<T: Contribution> Future for Handler<T> {
if let Some(pk) = pub_keys.get(self.hdb.uid()) {
assert_eq!(*pk, self.hdb.secret_key().public_key());
assert!(state.dhb().unwrap().netinfo().is_validator());
state.promote_to_validator()?;
if state.discriminant() == StateDsct::Observer {
state.promote_to_validator()?;
}
}
// FIXME: Handle removed nodes.
}