From f230d1dc82186b0df79cd8b1e03e51e23a9ec6ce Mon Sep 17 00:00:00 2001 From: aggstam Date: Mon, 25 Apr 2022 14:26:44 +0300 Subject: [PATCH] consensus2: renamed to consensus, fixed all dependencies --- bin/darkfid2/src/main.rs | 2 +- bin/faucetd/src/main.rs | 2 +- src/blockchain/blockstore.rs | 2 +- src/blockchain/metadatastore.rs | 2 +- src/blockchain/mod.rs | 2 +- src/blockchain/txstore.rs | 2 +- src/{consensus2 => consensus}/block.rs | 0 src/{consensus2 => consensus}/metadata.rs | 0 src/{consensus2 => consensus}/mod.rs | 0 src/{consensus2 => consensus}/participant.rs | 0 src/{consensus2 => consensus}/proto/mod.rs | 0 src/{consensus2 => consensus}/proto/protocol_participant.rs | 2 +- src/{consensus2 => consensus}/proto/protocol_proposal.rs | 2 +- src/{consensus2 => consensus}/proto/protocol_sync.rs | 2 +- .../proto/protocol_sync_consensus.rs | 2 +- src/{consensus2 => consensus}/proto/protocol_tx.rs | 2 +- src/{consensus2 => consensus}/proto/protocol_vote.rs | 2 +- src/{consensus2 => consensus}/state.rs | 0 src/{consensus2 => consensus}/task/block_sync.rs | 2 +- src/{consensus2 => consensus}/task/consensus_sync.rs | 2 +- src/{consensus2 => consensus}/task/mod.rs | 0 src/{consensus2 => consensus}/task/proposal.rs | 2 +- src/{consensus2 => consensus}/tx.rs | 0 src/{consensus2 => consensus}/util.rs | 0 src/{consensus2 => consensus}/vote.rs | 0 src/lib.rs | 5 +---- 26 files changed, 16 insertions(+), 19 deletions(-) rename src/{consensus2 => consensus}/block.rs (100%) rename src/{consensus2 => consensus}/metadata.rs (100%) rename src/{consensus2 => consensus}/mod.rs (100%) rename src/{consensus2 => consensus}/participant.rs (100%) rename src/{consensus2 => consensus}/proto/mod.rs (100%) rename src/{consensus2 => consensus}/proto/protocol_participant.rs (97%) rename src/{consensus2 => consensus}/proto/protocol_proposal.rs (98%) rename src/{consensus2 => consensus}/proto/protocol_sync.rs (99%) rename src/{consensus2 => consensus}/proto/protocol_sync_consensus.rs (99%) rename src/{consensus2 => consensus}/proto/protocol_tx.rs (97%) rename src/{consensus2 => consensus}/proto/protocol_vote.rs (98%) rename src/{consensus2 => consensus}/state.rs (100%) rename src/{consensus2 => consensus}/task/block_sync.rs (99%) rename src/{consensus2 => consensus}/task/consensus_sync.rs (98%) rename src/{consensus2 => consensus}/task/mod.rs (100%) rename src/{consensus2 => consensus}/task/proposal.rs (99%) rename src/{consensus2 => consensus}/tx.rs (100%) rename src/{consensus2 => consensus}/util.rs (100%) rename src/{consensus2 => consensus}/vote.rs (100%) diff --git a/bin/darkfid2/src/main.rs b/bin/darkfid2/src/main.rs index baa76105b..1a674483c 100644 --- a/bin/darkfid2/src/main.rs +++ b/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, diff --git a/bin/faucetd/src/main.rs b/bin/faucetd/src/main.rs index d46bef546..06852c04b 100644 --- a/bin/faucetd/src/main.rs +++ b/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, diff --git a/src/blockchain/blockstore.rs b/src/blockchain/blockstore.rs index ba399a89a..a3afdc97a 100644 --- a/src/blockchain/blockstore.rs +++ b/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, }; diff --git a/src/blockchain/metadatastore.rs b/src/blockchain/metadatastore.rs index 03a7bcde9..93866040e 100644 --- a/src/blockchain/metadatastore.rs +++ b/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, }; diff --git a/src/blockchain/mod.rs b/src/blockchain/mod.rs index 24583a447..e2f9ad176 100644 --- a/src/blockchain/mod.rs +++ b/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, diff --git a/src/blockchain/txstore.rs b/src/blockchain/txstore.rs index 8fbd25e25..53b36e0ad 100644 --- a/src/blockchain/txstore.rs +++ b/src/blockchain/txstore.rs @@ -1,7 +1,7 @@ use sled::Batch; use crate::{ - consensus2::Tx, + consensus::Tx, util::serial::{deserialize, serialize}, Error, Result, }; diff --git a/src/consensus2/block.rs b/src/consensus/block.rs similarity index 100% rename from src/consensus2/block.rs rename to src/consensus/block.rs diff --git a/src/consensus2/metadata.rs b/src/consensus/metadata.rs similarity index 100% rename from src/consensus2/metadata.rs rename to src/consensus/metadata.rs diff --git a/src/consensus2/mod.rs b/src/consensus/mod.rs similarity index 100% rename from src/consensus2/mod.rs rename to src/consensus/mod.rs diff --git a/src/consensus2/participant.rs b/src/consensus/participant.rs similarity index 100% rename from src/consensus2/participant.rs rename to src/consensus/participant.rs diff --git a/src/consensus2/proto/mod.rs b/src/consensus/proto/mod.rs similarity index 100% rename from src/consensus2/proto/mod.rs rename to src/consensus/proto/mod.rs diff --git a/src/consensus2/proto/protocol_participant.rs b/src/consensus/proto/protocol_participant.rs similarity index 97% rename from src/consensus2/proto/protocol_participant.rs rename to src/consensus/proto/protocol_participant.rs index 2251f9f56..0d66fe2dc 100644 --- a/src/consensus2/proto/protocol_participant.rs +++ b/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, diff --git a/src/consensus2/proto/protocol_proposal.rs b/src/consensus/proto/protocol_proposal.rs similarity index 98% rename from src/consensus2/proto/protocol_proposal.rs rename to src/consensus/proto/protocol_proposal.rs index f0de815fc..90e651c44 100644 --- a/src/consensus2/proto/protocol_proposal.rs +++ b/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, diff --git a/src/consensus2/proto/protocol_sync.rs b/src/consensus/proto/protocol_sync.rs similarity index 99% rename from src/consensus2/proto/protocol_sync.rs rename to src/consensus/proto/protocol_sync.rs index 2b4519185..0dff0ca94 100644 --- a/src/consensus2/proto/protocol_sync.rs +++ b/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, }, diff --git a/src/consensus2/proto/protocol_sync_consensus.rs b/src/consensus/proto/protocol_sync_consensus.rs similarity index 99% rename from src/consensus2/proto/protocol_sync_consensus.rs rename to src/consensus/proto/protocol_sync_consensus.rs index 06ba379f0..54197e7a8 100644 --- a/src/consensus2/proto/protocol_sync_consensus.rs +++ b/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, }, diff --git a/src/consensus2/proto/protocol_tx.rs b/src/consensus/proto/protocol_tx.rs similarity index 97% rename from src/consensus2/proto/protocol_tx.rs rename to src/consensus/proto/protocol_tx.rs index c5a2e44cd..3f586afad 100644 --- a/src/consensus2/proto/protocol_tx.rs +++ b/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, diff --git a/src/consensus2/proto/protocol_vote.rs b/src/consensus/proto/protocol_vote.rs similarity index 98% rename from src/consensus2/proto/protocol_vote.rs rename to src/consensus/proto/protocol_vote.rs index e98f64d31..85246bd69 100644 --- a/src/consensus2/proto/protocol_vote.rs +++ b/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, diff --git a/src/consensus2/state.rs b/src/consensus/state.rs similarity index 100% rename from src/consensus2/state.rs rename to src/consensus/state.rs diff --git a/src/consensus2/task/block_sync.rs b/src/consensus/task/block_sync.rs similarity index 99% rename from src/consensus2/task/block_sync.rs rename to src/consensus/task/block_sync.rs index abc8f65fc..3ee0c875c 100644 --- a/src/consensus2/task/block_sync.rs +++ b/src/consensus/task/block_sync.rs @@ -1,5 +1,5 @@ use crate::{ - consensus2::{ + consensus::{ block::{BlockOrder, BlockResponse}, ValidatorStatePtr, }, diff --git a/src/consensus2/task/consensus_sync.rs b/src/consensus/task/consensus_sync.rs similarity index 98% rename from src/consensus2/task/consensus_sync.rs rename to src/consensus/task/consensus_sync.rs index 42ea6c217..310587449 100644 --- a/src/consensus2/task/consensus_sync.rs +++ b/src/consensus/task/consensus_sync.rs @@ -1,7 +1,7 @@ use log::{info, warn}; use crate::{ - consensus2::{ + consensus::{ state::{ConsensusRequest, ConsensusResponse}, ValidatorStatePtr, }, diff --git a/src/consensus2/task/mod.rs b/src/consensus/task/mod.rs similarity index 100% rename from src/consensus2/task/mod.rs rename to src/consensus/task/mod.rs diff --git a/src/consensus2/task/proposal.rs b/src/consensus/task/proposal.rs similarity index 99% rename from src/consensus2/task/proposal.rs rename to src/consensus/task/proposal.rs index 0614be0f1..86b007648 100644 --- a/src/consensus2/task/proposal.rs +++ b/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, }; diff --git a/src/consensus2/tx.rs b/src/consensus/tx.rs similarity index 100% rename from src/consensus2/tx.rs rename to src/consensus/tx.rs diff --git a/src/consensus2/util.rs b/src/consensus/util.rs similarity index 100% rename from src/consensus2/util.rs rename to src/consensus/util.rs diff --git a/src/consensus2/vote.rs b/src/consensus/vote.rs similarity index 100% rename from src/consensus2/vote.rs rename to src/consensus/vote.rs diff --git a/src/lib.rs b/src/lib.rs index ee84aede0..b15aeb883 100644 --- a/src/lib.rs +++ b/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;