Extract engines to own crates

Cargo.toml

@@ -135,9 +135,4 @@ members = [
 	"ethcore/wasm/run",
 	"evmbin",
 	"parity-clib",
-	"util/triehash-ethereum",
-	"util/keccak-hasher",
-	"util/patricia-trie-ethereum",
-	"util/fastmap",
-	"util/time-utils",
 ]

ethcore/Cargo.toml

@@ -9,9 +9,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 account-db = { path = "account-db" }
 account-state = { path = "account-state" }
+authority-round = { path = "./engines/authority-round" }
 ansi_term = "0.11"
+basic-authority = { path = "./engines/basic-authority" }
 blooms-db = { path = "../util/blooms-db", optional = true }
 client-traits = { path = "./client-traits" }
+clique = { path = "./engines/clique" }
 common-types = { path = "types" }
 crossbeam-utils = "0.6"
 engine = { path = "./engine" }
@@ -20,6 +23,7 @@ ethabi = "8.0"
 ethabi-contract = "8.0"
 ethabi-derive = "8.0"
 ethash = { path = "../ethash" }
+ethash-engine = { path = "./engines/ethash" }
 ethcore-blockchain = { path = "./blockchain" }
 ethcore-bloom-journal = { path = "../util/bloom" }
 ethcore-builtin = { path = "./builtin" }
@@ -32,23 +36,25 @@ ethereum-types = "0.6.0"
 ethjson = { path = "../json" }
 ethkey = { path = "../accounts/ethkey" }
 evm = { path = "evm" }
+executive-state = { path = "executive-state" }
 futures = "0.1"
 hash-db = "0.15.0"
 parity-util-mem = "0.2.0"
+instant-seal = { path = "./engines/instant-seal" }
 itertools = "0.5"
 journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.2.0"
 keccak-hasher = { path = "../util/keccak-hasher" }
 kvdb = "0.1"
 kvdb-memorydb = "0.1"
 kvdb-rocksdb = { version = "0.1.3", optional = true }
-lazy_static = "1.2.0"
+lazy_static = "1.3.0"
 len-caching-lock = { path = "../util/len-caching-lock" }
 log = "0.4"
-lru-cache = "0.1"
+macros = { path = "../util/macros", optional = true }
 machine = { path = "./machine" }
-macros = { path = "../util/macros" }
 memory-cache = { path = "../util/memory-cache" }
+null-engine = { path = "./engines/null-engine" }
 num_cpus = "1.2"
 parity-bytes = "0.1"
 parity-snappy = "0.1"
@@ -85,14 +91,15 @@ ethcore-accounts = { path = "../accounts" }
 fetch = { path = "../util/fetch" }
 kvdb-rocksdb = "0.1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
+macros = { path = "../util/macros" }
 parity-runtime = { path = "../util/runtime" }
 rlp_compress = { path = "../util/rlp-compress" }
 serde_json = "1.0"
 tempdir = "0.3"
 trie-standardmap = "0.15.0"
 
 [features]
-parity = ["work-notify", "price-info", "stratum"]
+parity = ["work-notify", "price-info", "stratum", "macros"]
 # Large optional features that are enabled by default for Parity,
 # but might be omitted for other dependent crates.
 work-notify = ["ethcore-miner/work-notify"]
@@ -119,7 +126,7 @@ ci-skip-tests = []
 # Run memory/cpu heavy tests.
 test-heavy = []
 # Compile test helpers
-test-helpers = ["tempdir", "kvdb-rocksdb", "blooms-db"]
+test-helpers = ["tempdir", "kvdb-rocksdb", "blooms-db", "macros", "basic-authority/test-helpers"]
 
 [[bench]]
 name = "builtin"

ethcore/block-reward/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+description = "A crate to interact with the block rewards contract."
+name = "block-reward"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "GPL-3.0"
+
+[dependencies]
+common-types = { path = "../types" }
+engine = { path = "../engine" }
+ethabi = "8.0.1"
+ethabi-derive = "8.0.0"
+ethabi-contract = "8.0.1"
+ethereum-types = "0.6.0"
+keccak-hash = "0.2.0"
+machine = { path = "../machine" }
+trace = { path = "../trace" }
+
+[dev-dependencies]
+ethcore = { path = "..", features = ["test-helpers"] }

ethcore/src/engines/block_reward.rs → ethcore/block-reward/src/lib.rs

@@ -14,24 +14,25 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-//! A module with types for declaring block rewards and a client interface for interacting with a
+//! Types for declaring block rewards and a client interface for interacting with a
 //! block reward contract.
 
+use std::sync::Arc;
+
 use ethabi::FunctionOutputDecoder;
+use ethabi_contract::use_contract;
 use ethereum_types::{Address, U256};
-
-use std::sync::Arc;
-use hash::keccak;
-use machine::{Machine, ExecutedBlock};
-use trace;
-use types::{
+use common_types::{
 	BlockNumber,
 	errors::{EngineError, EthcoreError as Error},
 };
+use keccak_hash::keccak;
+use machine::{Machine, ExecutedBlock};
 use engine::{SystemOrCodeCall, SystemOrCodeCallKind};
+use trace;
 use trace::{Tracer, ExecutiveTracer, Tracing};
 
-use_contract!(block_reward_contract, "res/contracts/block_reward.json");
+use_contract!(block_reward_contract, "res/block_reward.json");
 
 /// The kind of block reward.
 /// Depending on the consensus engine the allocated block reward might have
@@ -161,13 +162,14 @@ pub fn apply_block_rewards(
 #[cfg(test)]
 mod test {
 	use std::str::FromStr;
-	use client::PrepareOpenBlock;
+	use ethcore::{
+		client::PrepareOpenBlock,
+		spec,
+		test_helpers::generate_dummy_client_with_spec,
+	};
 	use ethereum_types::{U256, Address};
-	use crate::spec;
-	use test_helpers::generate_dummy_client_with_spec;
-
 	use engine::SystemOrCodeCallKind;
-	use super::{BlockRewardContract, RewardKind};
+	use crate::{BlockRewardContract, RewardKind};
 
 	#[test]
 	fn block_reward_contract() {

ethcore/engine/src/engine.rs

@@ -31,6 +31,7 @@ use common_types::{
 		machine::{AuxiliaryData, AuxiliaryRequest},
 	},
 	errors::{EthcoreError as Error, EngineError},
+	snapshot::Snapshotting,
 	transaction::{self, UnverifiedTransaction},
 };
 use client_traits::EngineClient;
@@ -43,10 +44,7 @@ use machine::{
 };
 use vm::{EnvInfo, Schedule, CallType, ActionValue};
 
-use crate::{
-	signer::EngineSigner,
-	snapshot::SnapshotComponents,
-};
+use crate::signer::EngineSigner;
 
 /// A system-calling closure. Enacts calls on a block's state from the system address.
 pub type SystemCall<'a> = dyn FnMut(Address, Vec<u8>) -> Result<Vec<u8>, String> + 'a;
@@ -306,16 +304,8 @@ pub trait Engine: Sync + Send {
 	/// Trigger next step of the consensus engine.
 	fn step(&self) {}
 
-	/// Create a factory for building snapshot chunks and restoring from them.
-	/// Returning `None` indicates that this engine doesn't support snapshot creation.
-	fn snapshot_components(&self) -> Option<Box<dyn SnapshotComponents>> {
-		None
-	}
-
-	/// Whether this engine supports warp sync.
-	fn supports_warp(&self) -> bool {
-		self.snapshot_components().is_some()
-	}
+	/// Snapshot mode for the engine: Unsupported, PoW or PoA
+	fn snapshot_mode(&self) -> Snapshotting { Snapshotting::Unsupported }
 
 	/// Return a new open block header timestamp based on the parent timestamp.
 	fn open_block_header_timestamp(&self, parent_timestamp: u64) -> u64 {

ethcore/engine/src/lib.rs

@@ -18,7 +18,6 @@
 
 mod engine;
 pub mod signer;
-pub mod snapshot;
 
 pub use crate::engine::{
 	Engine,

ethcore/engines/authority-round/Cargo.toml

@@ -0,0 +1,39 @@
+[package]
+description = "Non-instant BFT proof-of-authority blockchain engine"
+name = "authority-round"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "GPL-3.0"
+
+[dependencies]
+block-reward = { path = "../../block-reward" }
+client-traits = { path = "../../client-traits" }
+common-types = { path = "../../types" }
+ethereum-types = "0.6.0"
+ethjson = { path = "../../../json" }
+ethkey = { path = "../../../accounts/ethkey" }
+engine = { path = "../../engine" }
+io = { package = "ethcore-io", path = "../../../util/io" }
+itertools = "0.5"
+keccak-hash = "0.2.0"
+lazy_static = "1.3.0"
+log = "0.4"
+lru-cache = "0.1"
+machine = { path = "../../machine" }
+macros = { path = "../../../util/macros" }
+parking_lot = "0.8"
+rand = "0.6"
+rlp = "0.4.0"
+time-utils = { path = "../../../util/time-utils" }
+unexpected = { path = "../../../util/unexpected" }
+validator-set = { path = "../validator-set" }
+
+[dev-dependencies]
+accounts = { package = "ethcore-accounts", path = "../../../accounts" }
+engine = { path = "../../engine", features = ["test-helpers"] }
+env_logger = "0.6.2"
+ethcore = { path = "../..", features = ["test-helpers"] }
+state-db = { path = "../../state-db" }
+validator-set = { path = "../validator-set", features = ["test-helpers"] }
+serde_json = "1"

ethcore/src/engines/authority_round/finality.rs → ethcore/engines/authority-round/src/finality.rs

@@ -19,10 +19,10 @@
 use std::collections::{VecDeque};
 use std::collections::hash_map::{HashMap, Entry};
 
+use common_types::BlockNumber;
 use ethereum_types::{H256, Address};
-use types::BlockNumber;
-
-use engines::validator_set::SimpleList;
+use log::{trace, warn};
+use validator_set::SimpleList;
 
 /// Error indicating unknown validator.
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -179,8 +179,8 @@ impl RollingFinality {
 
 #[cfg(test)]
 mod tests {
+	use common_types::BlockNumber;
 	use ethereum_types::{H256, Address};
-	use types::BlockNumber;
 	use super::RollingFinality;
 
 	#[test]

ethcore/src/engines/authority_round/mod.rs → ethcore/engines/authority-round/src/lib.rs

@@ -29,27 +29,25 @@ use std::sync::{Weak, Arc};
 use std::time::{UNIX_EPOCH, Duration};
 
 use client_traits::EngineClient;
-use engine::{Engine,ConstructedVerifier};
-use engines::block_reward;
-use engines::block_reward::{BlockRewardContract, RewardKind};
-use engine::snapshot::SnapshotComponents;
+use engine::{Engine, ConstructedVerifier};
+use block_reward::{self, BlockRewardContract, RewardKind};
 use ethjson;
 use machine::{
 	ExecutedBlock,
 	Machine,
 };
-use hash::keccak;
+use macros::map;
+use keccak_hash::keccak;
+use log::{info, debug, error, trace, warn};
 use engine::signer::EngineSigner;
-use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
-use self::finality::RollingFinality;
 use ethkey::{self, Signature};
 use io::{IoContext, IoHandler, TimerToken, IoService};
 use itertools::{self, Itertools};
 use rlp::{encode, Decodable, DecoderError, Encodable, RlpStream, Rlp};
 use ethereum_types::{H256, H520, Address, U128, U256};
 use parking_lot::{Mutex, RwLock};
 use time_utils::CheckedSystemTime;
-use types::{
+use common_types::{
 	ancestry_action::AncestryAction,
 	BlockNumber,
 	header::{Header, ExtendedHeader},
@@ -62,11 +60,16 @@ use types::{
 		machine::{Call, AuxiliaryData},
 	},
 	errors::{BlockError, EthcoreError as Error, EngineError},
+	snapshot::Snapshotting,
 };
 use unexpected::{Mismatch, OutOfBounds};
 
+use validator_set::{ValidatorSet, SimpleList, new_validator_set};
+
 mod finality;
 
+use self::finality::RollingFinality;
+
 /// `AuthorityRound` params.
 pub struct AuthorityRoundParams {
 	/// Time to wait before next block or authority switching,
@@ -1631,11 +1634,11 @@ impl Engine for AuthorityRound {
 		)
 	}
 
-	fn snapshot_components(&self) -> Option<Box<dyn (SnapshotComponents)>> {
+	fn snapshot_mode(&self) -> Snapshotting {
 		if self.immediate_transitions {
-			None
+			Snapshotting::Unsupported
 		} else {
-			Some(Box::new(::snapshot::PoaSnapshot))
+			Snapshotting::PoA
 		}
 	}
 
@@ -1663,29 +1666,33 @@ mod tests {
 	use std::str::FromStr;
 	use std::sync::Arc;
 	use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
-	use hash::keccak;
+	use keccak_hash::keccak;
 	use accounts::AccountProvider;
 	use ethereum_types::{Address, H520, H256, U256};
 	use ethkey::Signature;
-	use types::{
+	use common_types::{
 		header::Header,
 		engines::{Seal, params::CommonParams},
 		errors::{EthcoreError as Error, EngineError},
 		transaction::{Action, Transaction},
 	};
 	use rlp::encode;
-	use block::*;
-	use test_helpers::{
-		generate_dummy_client_with_spec, get_temp_state_db,
-		TestNotify
+	use ethcore::{
+		block::*,
+		test_helpers::{
+			generate_dummy_client_with_spec, get_temp_state_db,
+			TestNotify
+		},
+		spec::{self, Spec},
 	};
-	use crate::spec::{Spec, self};
 	use engine::Engine;
-	use engines::block_reward::BlockRewardContract;
-	use engines::validator_set::{TestSet, SimpleList};
-	use super::{AuthorityRoundParams, AuthorityRound, EmptyStep, SealedEmptyStep, calculate_score};
+	use block_reward::BlockRewardContract;
+	use validator_set::{TestSet, SimpleList};
 	use machine::Machine;
 	use ethjson;
+	use serde_json;
+
+	use super::{AuthorityRoundParams, AuthorityRound, EmptyStep, SealedEmptyStep, calculate_score};
 
 	fn build_aura<F>(f: F) -> Arc<AuthorityRound> where
 		F: FnOnce(&mut AuthorityRoundParams),
@@ -1719,7 +1726,7 @@ mod tests {
 	#[test]
 	fn has_valid_metadata() {
 		let engine = spec::new_test_round().engine;
-		assert!(!engine.name().is_empty());
+		assert_eq!(engine.name(), "AuthorityRound");
 	}
 
 	#[test]