From ca2dd2327ed84117924c43bf40ecf07bef4a7a39 Mon Sep 17 00:00:00 2001 From: Andreas Fackler Date: Tue, 10 Jul 2018 17:29:31 +0200 Subject: [PATCH] Add back InvalidNodeTransactionSignature fault. This was accidentally removed due to a merge conflict. --- src/dynamic_honey_badger.rs | 4 +++- src/queueing_honey_badger.rs | 3 +-- tests/queueing_honey_badger.rs | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dynamic_honey_badger.rs b/src/dynamic_honey_badger.rs index 4094e8b..72b7b3c 100644 --- a/src/dynamic_honey_badger.rs +++ b/src/dynamic_honey_badger.rs @@ -56,7 +56,7 @@ use clear_on_drop::ClearOnDrop; use serde::{Deserialize, Serialize}; use crypto::{PublicKey, PublicKeySet, SecretKey, Signature}; -use fault_log::FaultLog; +use fault_log::{FaultKind, FaultLog}; use honey_badger::{self, HoneyBadger, Message as HbMessage}; use messaging::{DistAlgorithm, NetworkInfo, Target, TargetedMessage}; use sync_key_gen::{Accept, Propose, ProposeOutcome, SyncKeyGen}; @@ -349,6 +349,8 @@ where } if !self.verify_signature(&s_id, &sig, &node_tx)? { info!("Invalid signature from {:?} for: {:?}.", s_id, node_tx); + let fault_kind = FaultKind::InvalidNodeTransactionSignature; + fault_log.append(s_id.clone(), fault_kind); continue; } use self::NodeTransaction::*; diff --git a/src/queueing_honey_badger.rs b/src/queueing_honey_badger.rs index 7f033de..db2c749 100644 --- a/src/queueing_honey_badger.rs +++ b/src/queueing_honey_badger.rs @@ -12,11 +12,10 @@ use serde::{Deserialize, Serialize}; use dynamic_honey_badger::{self, Batch as DhbBatch, DynamicHoneyBadger, Message}; use fault_log::FaultLog; use messaging::{DistAlgorithm, NetworkInfo, TargetedMessage}; +use transaction_queue::TransactionQueue; pub use dynamic_honey_badger::{Change, ChangeState, Input}; -use transaction_queue::TransactionQueue; - error_chain!{ links { DynamicHoneyBadger(dynamic_honey_badger::Error, dynamic_honey_badger::ErrorKind); diff --git a/tests/queueing_honey_badger.rs b/tests/queueing_honey_badger.rs index 792ec36..46e9b04 100644 --- a/tests/queueing_honey_badger.rs +++ b/tests/queueing_honey_badger.rs @@ -1,9 +1,9 @@ //! Network tests for Queueing Honey Badger. +extern crate env_logger; extern crate hbbft; #[macro_use] extern crate log; -extern crate env_logger; extern crate pairing; extern crate rand; #[macro_use] @@ -16,10 +16,9 @@ use std::collections::BTreeMap; use std::iter::once; use std::rc::Rc; -use rand::Rng; - use hbbft::messaging::NetworkInfo; use hbbft::queueing_honey_badger::{Change, ChangeState, Input, QueueingHoneyBadger}; +use rand::Rng; use network::{Adversary, MessageScheduler, NodeUid, SilentAdversary, TestNetwork, TestNode};