fixed some typos and wrong calculation of duration for the resend .

Author: SurfingNerd

crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs

@@ -262,7 +262,7 @@ impl HbbftEarlyEpochEndManager {
     }
 
     /// decides on the memorium data if we should update to contract data,
-    /// end sends out transactions to do so.
+    /// and sends out transactions to do so.
     pub fn decide(
         &mut self,
         memorium: &HbbftMessageMemorium,
@@ -300,10 +300,9 @@ impl HbbftEarlyEpochEndManager {
         // this should hold true.
         if now >= block_time {
             let elapsed_since_last_block = now - block_time;
-            // todo:
-            // this is max blocktime (hartbeat) x 2.
-            // on phoenix protocol triggers, this would also skip the block production.
-            if elapsed_since_last_block > 10 {
+            // todo: this is max blocktime (heartbeat) x 2, better read the maximum blocktime.
+            // on phoenix protocol triggers, this would also skip the sending of disconnectivity reports.
+            if elapsed_since_last_block > 10 * 60 {
                 info!(target:"engine", "skipping early-epoch-end: now {now} ; block_time {block_time}: Block WAS created in the future ?!?! :-x. not sending early epoch end reports.");
                 return;
             }
@@ -319,19 +318,19 @@ impl HbbftEarlyEpochEndManager {
         // end of implementation for:
         // https://github.com/DMDcoin/diamond-node/issues/243
 
-        let treshold: u64 = 2;
+        let threshold: u64 = 2;
 
         // todo: read this out from contracts: ConnectivityTrackerHbbft -> reportDisallowPeriod
         // requires us to update the Contracts ABIs:
         // https://github.com/DMDcoin/diamond-node/issues/115
-        let treshold_time = Duration::from_secs(12 * 60); // 12 Minutes = 1 times the heartbeat + 2 minutes as grace period.
+        let threshold_time = Duration::from_secs(12 * 60); // 12 Minutes = 1 times the heartbeat + 2 minutes as grace period.
 
-        if self.start_time.elapsed() < treshold_time {
-            debug!(target: "engine", "early-epoch-end: no decision: Treshold time not reached.");
+        if self.start_time.elapsed() < threshold_time {
+            debug!(target: "engine", "early-epoch-end: no decision: Threshold time not reached.");
             return;
         }
 
-        if block_num < self.start_block + treshold {
+        if block_num < self.start_block + threshold {
             // not enought blocks have passed this epoch,
             // to judge other nodes.
             debug!(target: "engine", "early-epoch-end: no decision: not enough blocks.");
@@ -355,7 +354,7 @@ impl HbbftEarlyEpochEndManager {
                 if let Some(node_history) = epoch_history.get_history_for_node(validator) {
                     let last_message_time = node_history.get_last_good_message_time();
                     let last_message_time_lateness = last_message_time.elapsed();
-                    if last_message_time_lateness > treshold_time {
+                    if last_message_time_lateness > threshold_time {
                         // we do not have to send notification, if we already did so.
                         if !self.is_reported(client, validator_address) {
                             // this function will also add the validator to the list of flagged validators.

crates/ethcore/src/engines/hbbft/hbbft_engine.rs

@@ -386,7 +386,7 @@ impl IoHandler<()> for TransitionHandler {
                 |e| warn!(target: "consensus", "ENGINE_PHOENIX_CHECK Timer failed: {}.", e),
             );
 
-        // ealry epoch end connecitity token should be the same lenght then the max blocktime.
+        // early epoch end connecitity token should be the same length then the max blocktime.
         io.register_timer(HBBFT_CONNECTIVITY_TOKEN, Duration::from_secs(300))
             .unwrap_or_else(
                 |e| warn!(target: "consensus", "ENGINE_PHOENIX_CHECK Timer failed: {}.", e),
@@ -896,7 +896,7 @@ impl HoneyBadgerBFT {
                 self.hbbft_message_dispatcher.report_seal_bad(
                     &sender_id,
                     block_num,
-                    BadSealReason::ErrorTresholdSignStep,
+                    BadSealReason::ErrorThresholdSignStep,
                 );
             }
         }
@@ -1264,7 +1264,7 @@ impl HoneyBadgerBFT {
                         };
                     } // drop lock for hbbft_state
 
-                    if validator_set.len() > 0 {
+                    if !validator_set.is_empty() {
                         self.hbbft_peers_service.send_message(
                             HbbftConnectToPeersMessage::ConnectToCurrentPeers(validator_set),
                         )?;
@@ -1310,7 +1310,7 @@ impl HoneyBadgerBFT {
     /// hbbft early epoch end actions are executed on a different timing than the regular validator engine steps
     fn do_validator_engine_early_epoch_end_actions(&self) -> Result<(), Error> {
         // here we need to differentiate the different engine functions,
-        // that requre different levels of access to the client.
+        // that requires different levels of access to the client.
         trace!(target: "engine", "do_validator_engine_actions.");
         match self.client_arc() {
             Some(client_arc) => {
@@ -1462,17 +1462,17 @@ impl HoneyBadgerBFT {
         }
     }
 
-    /** returns if the signer of hbbft is tracked as available in the hbbft contracts..*/
+    /// returns if the signer of hbbft is tracked as available in the hbbft contracts.
     pub fn is_available(&self) -> bool {
         self.hbbft_engine_cache.lock().is_available()
     }
 
-    /** returns if the signer of hbbft is stacked. */
+    /// returns if the signer of hbbft is stacked.
     pub fn is_staked(&self) -> bool {
         self.hbbft_engine_cache.lock().is_staked()
     }
 
-    /** returns if the signer of hbbft is a current validator. */
+    /// returns if the signer of hbbft is a current validator.
     pub fn is_validator(&self) -> bool {
         self.hbbft_state.read().is_validator()
     }

crates/ethcore/src/engines/hbbft/hbbft_message_memorium.rs

@@ -595,7 +595,7 @@ struct StakingEpochRange {
 
 #[derive(Debug, Clone)]
 pub enum BadSealReason {
-    ErrorTresholdSignStep,
+    ErrorThresholdSignStep,
     MismatchedNetworkInfo,
 }