Move VoteCollector into Tendermint

Author: foriequal0

core/src/consensus/mod.rs

@@ -24,7 +24,6 @@ mod solo;
 pub mod stake;
 mod tendermint;
 mod validator_set;
-pub mod vote_collector;
 
 pub use self::blake_pow::BlakePoW;
 pub use self::cuckoo::Cuckoo;

core/src/consensus/tendermint/mod.rs

@@ -21,6 +21,7 @@ mod message;
 mod network;
 mod params;
 pub mod types;
+pub mod vote_collector;
 mod worker;
 
 use std::sync::atomic::AtomicBool;

core/src/consensus/vote_collector.rs renamed to core/src/consensus/tendermint/vote_collector.rs

@@ -23,8 +23,8 @@ use primitives::H256;
 use rlp::{Encodable, RlpStream};
 
 use super::stake::Action;
-use super::BitSet;
 use super::{ConsensusMessage, VoteStep};
+use crate::consensus::BitSet;
 
 /// Storing all Proposals, Prevotes and Precommits.
 #[derive(Debug)]

core/src/consensus/tendermint/worker.rs

@@ -37,6 +37,7 @@ use super::network;
 use super::params::TimeGapParams;
 use super::stake::CUSTOM_ACTION_HANDLER_ID;
 use super::types::{Height, Proposal, Step, TendermintSealView, TendermintState, TwoThirdsMajority, View};
+use super::vote_collector::{DoubleVote, VoteCollector};
 use super::{
  BlockHash, ENGINE_TIMEOUT_BROADCAST_STEP_STATE, ENGINE_TIMEOUT_EMPTY_PROPOSAL, ENGINE_TIMEOUT_TOKEN_NONCE_BASE,
  SEAL_FIELDS,
@@ -46,7 +47,6 @@ use crate::block::*;
 use crate::client::ConsensusClient;
 use crate::consensus::signer::EngineSigner;
 use crate::consensus::validator_set::{DynamicValidator, ValidatorSet};
-use crate::consensus::vote_collector::{DoubleVote, VoteCollector};
 use crate::consensus::{EngineError, Seal};
 use crate::encoded;
 use crate::error::{BlockError, Error};