Integrate sender queue changes.

Cargo.toml

@@ -54,8 +54,8 @@ clear_on_drop = "0.2"
 version = "*"
 # git = "https://github.com/c0gent/hbbft"
 git = "https://github.com/poanetwork/hbbft"
-# branch = "c0gent-rng-sync"
-branch = "master"
+# branch = "master"
+branch = "vk-extern-sender-queue"
 # path = "../hbbft"
 
 [profile.release]

src/hydrabadger/handler.rs

@@ -15,7 +15,7 @@ use hbbft::{
     dynamic_honey_badger::{ChangeState, JoinPlan, Message as DhbMessage, Change as DhbChange, Input as DhbInput},
     // queueing_honey_badger::{Change as QhbChange, Input as QhbInput},
     sync_key_gen::{Ack, AckOutcome, Part, PartOutcome, SyncKeyGen},
-    DistAlgorithm, Target
+    DistAlgorithm, Target, Epoched,
 };
 use peer::Peers;
 use serde::{Deserialize, Serialize};
@@ -764,7 +764,7 @@ impl<T: Contribution> Future for Handler<T> {
             for batch in step.output.drain(..) {
                 info!("A HONEY BADGER BATCH WITH CONTRIBUTIONS IS BEING STREAMED...");
 
-                let batch_epoch = batch.epoch();
+                let batch_epoch = batch.seqnum();
                 let prev_epoch = self.hdb.set_current_epoch(batch_epoch + 1);
                 assert_eq!(prev_epoch, batch_epoch);
 

src/hydrabadger/state.rs

@@ -238,7 +238,7 @@ impl<T: Contribution> State<T> {
                 ref mut iom_queue, ..
             } => {
                 let (dhb, dhb_step) = DynamicHoneyBadger::builder()
-                    .epoch(cfg.start_epoch)
+                    .era(cfg.start_epoch)
                     .build_joining(local_uid, local_sk, jp)?;
                 step_queue.push(dhb_step);
 
@@ -310,7 +310,7 @@ impl<T: Contribution> State<T> {
                 let netinfo = NetworkInfo::new(local_uid, sk_share, pk_set, local_sk, node_ids);
 
                 let dhb = DynamicHoneyBadger::builder()
-                    .epoch(cfg.start_epoch)
+                    .era(cfg.start_epoch)
                     .build(netinfo);
 
                 info!("");