consensus2: renamed to consensus, fixed all dependencies

bin/darkfid2/src/main.rs

@@ -18,7 +18,7 @@ use darkfi::{
     async_daemonize,
     blockchain::{NullifierStore, RootStore},
     cli_desc,
-    consensus2::{
+    consensus::{
         proto::{
             ProtocolParticipant, ProtocolProposal, ProtocolSync, ProtocolSyncConsensus, ProtocolTx,
             ProtocolVote,

bin/faucetd/src/main.rs

@@ -21,7 +21,7 @@ use darkfi::{
     async_daemonize,
     blockchain::{NullifierStore, RootStore},
     cli_desc,
-    consensus2::{
+    consensus::{
         proto::{ProtocolSync, ProtocolTx},
         task::block_sync_task,
         Timestamp, Tx, ValidatorState, MAINNET_GENESIS_HASH_BYTES, TESTNET_GENESIS_HASH_BYTES,

src/blockchain/blockstore.rs

@@ -2,7 +2,7 @@ use log::warn;
 use sled::Batch;
 
 use crate::{
-    consensus2::{util::Timestamp, Block},
+    consensus::{util::Timestamp, Block},
     util::serial::{deserialize, serialize},
     Error, Result,
 };

src/blockchain/metadatastore.rs

@@ -1,7 +1,7 @@
 use sled::Batch;
 
 use crate::{
-    consensus2::{Block, StreamletMetadata, Timestamp},
+    consensus::{Block, StreamletMetadata, Timestamp},
     util::serial::{deserialize, serialize},
     Error, Result,
 };

src/blockchain/mod.rs

@@ -3,7 +3,7 @@ use std::io;
 use log::debug;
 
 use crate::{
-    consensus2::{block::BlockInfo, util::Timestamp, Block, BlockProposal},
+    consensus::{block::BlockInfo, util::Timestamp, Block, BlockProposal},
     impl_vec,
     util::serial::{Decodable, Encodable, ReadExt, VarInt, WriteExt},
     Result,

src/blockchain/txstore.rs

@@ -1,7 +1,7 @@
 use sled::Batch;
 
 use crate::{
-    consensus2::Tx,
+    consensus::Tx,
     util::serial::{deserialize, serialize},
     Error, Result,
 };

src/consensus2/proto/protocol_participant.rs → src/consensus/proto/protocol_participant.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use log::debug;
 
 use crate::{
-    consensus2::{Participant, ValidatorStatePtr},
+    consensus::{Participant, ValidatorStatePtr},
     net::{
         ChannelPtr, MessageSubscription, P2pPtr, ProtocolBase, ProtocolBasePtr,
         ProtocolJobsManager, ProtocolJobsManagerPtr,

src/consensus2/proto/protocol_proposal.rs → src/consensus/proto/protocol_proposal.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use log::debug;
 
 use crate::{
-    consensus2::{BlockProposal, ValidatorStatePtr},
+    consensus::{BlockProposal, ValidatorStatePtr},
     net::{
         ChannelPtr, MessageSubscription, P2pPtr, ProtocolBase, ProtocolBasePtr,
         ProtocolJobsManager, ProtocolJobsManagerPtr,

src/consensus2/proto/protocol_sync.rs → src/consensus/proto/protocol_sync.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use log::debug;
 
 use crate::{
-    consensus2::{
+    consensus::{
         block::{BlockInfo, BlockOrder, BlockResponse},
         ValidatorStatePtr,
     },

src/consensus2/proto/protocol_sync_consensus.rs → src/consensus/proto/protocol_sync_consensus.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use log::debug;
 
 use crate::{
-    consensus2::{
+    consensus::{
         state::{ConsensusRequest, ConsensusResponse},
         ValidatorStatePtr,
     },

src/consensus2/proto/protocol_tx.rs → src/consensus/proto/protocol_tx.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use log::debug;
 
 use crate::{
-    consensus2::{Tx, ValidatorStatePtr},
+    consensus::{Tx, ValidatorStatePtr},
     net::{
         ChannelPtr, MessageSubscription, P2pPtr, ProtocolBase, ProtocolBasePtr,
         ProtocolJobsManager, ProtocolJobsManagerPtr,

src/consensus2/proto/protocol_vote.rs → src/consensus/proto/protocol_vote.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use log::debug;
 
 use crate::{
-    consensus2::{ValidatorStatePtr, Vote},
+    consensus::{ValidatorStatePtr, Vote},
     net::{
         ChannelPtr, MessageSubscription, P2pPtr, ProtocolBase, ProtocolBasePtr,
         ProtocolJobsManager, ProtocolJobsManagerPtr,

src/consensus2/task/block_sync.rs → src/consensus/task/block_sync.rs

@@ -1,5 +1,5 @@
 use crate::{
-    consensus2::{
+    consensus::{
         block::{BlockOrder, BlockResponse},
         ValidatorStatePtr,
     },

src/consensus2/task/consensus_sync.rs → src/consensus/task/consensus_sync.rs

@@ -1,7 +1,7 @@
 use log::{info, warn};
 
 use crate::{
-    consensus2::{
+    consensus::{
         state::{ConsensusRequest, ConsensusResponse},
         ValidatorStatePtr,
     },

src/consensus2/task/proposal.rs → src/consensus/task/proposal.rs

@@ -4,7 +4,7 @@ use log::{debug, error, info};
 
 use super::consensus_sync_task;
 use crate::{
-    consensus2::{state::ValidatorStatePtr, Participant},
+    consensus::{state::ValidatorStatePtr, Participant},
     net,
     util::async_util::sleep,
 };

src/lib.rs

@@ -4,11 +4,8 @@ pub use error::{ClientFailed, ClientResult, Error, Result, VerifyFailed, VerifyR
 #[cfg(feature = "blockchain")]
 pub mod blockchain;
 
-#[cfg(feature = "blockchain2")]
-pub mod consensus;
-
 #[cfg(feature = "blockchain")]
-pub mod consensus2;
+pub mod consensus;
 
 #[cfg(feature = "crypto")]
 pub mod crypto;