From f96ab58f0c6ef27ae6ff3073e25832c47b9c8d57 Mon Sep 17 00:00:00 2001
From: c0gent <nsan1129@gmail.com>
Date: Fri, 12 Oct 2018 12:51:35 -0700
Subject: [PATCH] Updates.

---
 Cargo.toml                 |  5 +++--
 gdb-node                   |  2 ++
 ltrace-node                |  2 ++
 run-node                   |  2 ++
 src/hydrabadger/handler.rs |  2 +-
 src/hydrabadger/state.rs   | 10 ++++------
 src/lib.rs                 | 15 ++-------------
 valgrind-node              |  2 ++
 8 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3744710..1cd0534 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,8 +54,9 @@ clear_on_drop = "*"
 version = "*"
 # git = "https://github.com/c0gent/hbbft"
 git = "https://github.com/poanetwork/hbbft"
-branch = "c0gent-rng-sync"
-# branch = "master"
+# branch = "c0gent-rng-sync"
+# branch = "afck-netinfo"
+branch = "master"
 # path = "../hbbft"
 
 [profile.release]
diff --git a/gdb-node b/gdb-node
index 3c979b0..2831a87 100755
--- a/gdb-node
+++ b/gdb-node
@@ -37,6 +37,8 @@ else
     DIRECTORY="release"
 fi
 
+set -e
+
 cargo build $RELEASE
 
 # printf "\nLimiting process memory limit to 400MiB...\n\n"
diff --git a/ltrace-node b/ltrace-node
index 7a3beb8..4dd6376 100755
--- a/ltrace-node
+++ b/ltrace-node
@@ -37,6 +37,8 @@ else
     DIRECTORY="release"
 fi
 
+set -e
+
 cargo build $RELEASE
 
 # printf "\nLimiting process memory limit to 400MiB...\n\n"
diff --git a/run-node b/run-node
index c7aa987..7fff645 100755
--- a/run-node
+++ b/run-node
@@ -37,6 +37,8 @@ else
     DIRECTORY="release"
 fi
 
+set -e
+
 cargo build $RELEASE
 
 # printf "\nLimiting process memory limit to 400MiB...\n\n"
diff --git a/src/hydrabadger/handler.rs b/src/hydrabadger/handler.rs
index dede2bd..34f87f4 100644
--- a/src/hydrabadger/handler.rs
+++ b/src/hydrabadger/handler.rs
@@ -13,9 +13,9 @@ use crossbeam::queue::SegQueue;
 use hbbft::{
     crypto::{PublicKey, PublicKeySet},
     dynamic_honey_badger::{ChangeState, JoinPlan, Message as DhbMessage, Change as DhbChange, Input as DhbInput},
-    messaging::{DistAlgorithm, Target},
     // queueing_honey_badger::{Change as QhbChange, Input as QhbInput},
     sync_key_gen::{Ack, Part, PartOutcome, SyncKeyGen},
+    DistAlgorithm, Target
 };
 use peer::Peers;
 use serde::{Deserialize, Serialize};
diff --git a/src/hydrabadger/state.rs b/src/hydrabadger/state.rs
index f3d8f53..fc3c4b0 100644
--- a/src/hydrabadger/state.rs
+++ b/src/hydrabadger/state.rs
@@ -10,9 +10,8 @@ use crossbeam::queue::SegQueue;
 use hbbft::{
     crypto::{PublicKey, SecretKey},
     dynamic_honey_badger::{DynamicHoneyBadger, JoinPlan, Error as DhbError},
-    messaging::{DistAlgorithm, NetworkInfo},
-    // queueing_honey_badger::{Error as QhbError, DynamicHoneyBadger},
     sync_key_gen::{Ack, Part, PartOutcome, SyncKeyGen},
+    DistAlgorithm, NetworkInfo,
 };
 use peer::Peers;
 use std::{collections::BTreeMap, fmt};
@@ -281,7 +280,7 @@ impl<T: Contribution> State<T> {
         local_sk: SecretKey,
         peers: &Peers<T>,
         cfg: &Config,
-        step_queue: &SegQueue<Step<T>>,
+        _step_queue: &SegQueue<Step<T>>,
     ) -> Result<SegQueue<InputOrMessage<T>>, Error> {
         let iom_queue_ret;
         *self = match self {
@@ -308,9 +307,8 @@ impl<T: Contribution> State<T> {
 
                 let netinfo = NetworkInfo::new(local_uid, sk_share, pk_set, local_sk, node_ids);
 
-                let (dhb, dhb_step) = DynamicHoneyBadger::builder()
-                    .build(netinfo)?;
-                step_queue.push(dhb_step);
+                let dhb = DynamicHoneyBadger::builder()
+                    .build(netinfo);
 
                 info!("");
                 info!("== HONEY BADGER INITIALIZED ==");
diff --git a/src/lib.rs b/src/lib.rs
index 7e31eb0..a2a857e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -34,15 +34,6 @@ extern crate serde;
 extern crate serde_bytes;
 extern crate tokio_serde_bincode;
 
-// Config {
-//     batch_size: DEFAULT_BATCH_SIZE,
-//     txn_gen_count: DEFAULT_TXN_GEN_COUNT,
-//     txn_gen_interval: DEFAULT_TXN_GEN_INTERVAL,
-//     txn_bytes: DEFAULT_TXN_BYTES,
-//     keygen_peer_count: DEFAULT_KEYGEN_PEER_COUNT,
-//     output_extra_delay_ms: DEFAULT_OUTPUT_EXTRA_DELAY_MS,
-// }
-
 #[cfg(feature = "nightly")]
 use alloc_system::System;
 
@@ -68,14 +59,12 @@ use std::{
 };
 use tokio::{io, net::TcpStream, prelude::*, codec::{Framed, LengthDelimitedCodec}};
 use uuid::Uuid;
-// use bincode::{serialize, deserialize};
 use hbbft::{
     crypto::{PublicKey, PublicKeySet},
     dynamic_honey_badger::{JoinPlan, Message as DhbMessage, DynamicHoneyBadger, Input as DhbInput},
-    messaging::Step as MessagingStep,
-    // queueing_honey_badger::{Input as QhbInput},
     sync_key_gen::{Ack, Part},
-    traits::Contribution as HbbftContribution,
+    Step as MessagingStep,
+    Contribution as HbbftContribution,
 };
 
 pub use blockchain::{Blockchain, MiningError};
diff --git a/valgrind-node b/valgrind-node
index 1a65acc..179c4dc 100755
--- a/valgrind-node
+++ b/valgrind-node
@@ -37,6 +37,8 @@ else
     DIRECTORY="release"
 fi
 
+set -e
+
 cargo build $RELEASE
 
 # printf "\nLimiting process memory limit to 400MiB...\n\n"