Extract the Engine trait

Cargo.toml

@@ -33,6 +33,7 @@ jsonrpc-core = "12.0.0"
 parity-bytes = "0.1"
 client-traits = { path = "ethcore/client-traits" }
 common-types = { path = "ethcore/types" }
+engine = { path = "ethcore/engine" }
 ethcore = { path = "ethcore", features = ["parity"] }
 ethcore-accounts = { path = "accounts", optional = true }
 ethcore-blockchain = { path = "ethcore/blockchain" }

ethash/src/lib.rs

@@ -85,7 +85,7 @@ impl EthashManager {
 		EthashManager {
 			cache_dir: cache_dir.to_path_buf(),
 			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default(), progpow_transition),
-			progpow_transition: progpow_transition,
+			progpow_transition,
 			cache: Mutex::new(LightCache {
 				recent_epoch: None,
 				recent: None,

ethcore/Cargo.toml

@@ -8,11 +8,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 account-db = { path = "account-db" }
+account-state = { path = "account-state" }
 ansi_term = "0.11"
 blooms-db = { path = "../util/blooms-db", optional = true }
 client-traits = { path = "./client-traits" }
 common-types = { path = "types" }
 crossbeam-utils = "0.6"
+engine = { path = "./engine" }
 env_logger = { version = "0.5", optional = true }
 ethabi = "8.0"
 ethabi-contract = "8.0"
@@ -30,10 +32,8 @@ ethereum-types = "0.6.0"
 ethjson = { path = "../json" }
 ethkey = { path = "../accounts/ethkey" }
 evm = { path = "evm" }
-trie-vm-factories = { path = "trie-vm-factories" }
 futures = "0.1"
 hash-db = "0.12.4"
-parity-util-mem = "0.1"
 itertools = "0.5"
 journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.2.0"
@@ -51,43 +51,45 @@ memory-cache = { path = "../util/memory-cache" }
 num_cpus = "1.2"
 parity-bytes = "0.1"
 parity-snappy = "0.1"
+parity-util-mem = "0.1"
 parking_lot = "0.8"
-pod = { path = "pod" }
-trie-db = "0.12.4"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
+pod = { path = "pod" }
 rand = "0.6"
+rand_xorshift = "0.1.1"
 rayon = "1.1"
 rlp = "0.4.0"
 rlp_derive = { path = "../util/rlp-derive" }
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-account-state = { path = "account-state" }
-stats = { path = "../util/stats" }
 state-db = { path = "state-db" }
+stats = { path = "../util/stats" }
 tempdir = { version = "0.3", optional = true }
 time-utils = { path = "../util/time-utils" }
 trace = { path = "trace" }
 trace-time = "0.1"
+trie-db = "0.12.4"
+trie-vm-factories = { path = "trie-vm-factories" }
 triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }
 using_queue = { path = "../miner/using-queue" }
 vm = { path = "vm" }
-rand_xorshift = "0.1.1"
 
 [dev-dependencies]
 blooms-db = { path = "../util/blooms-db" }
 criterion = "0.2"
+engine = { path = "./engine", features = ["test-helpers"] }
 env_logger = "0.5"
 ethcore-accounts = { path = "../accounts" }
 fetch = { path = "../util/fetch" }
 kvdb-rocksdb = "0.1.3"
+machine = { path = "./machine", features = ["test-helpers"] }
 parity-runtime = { path = "../util/runtime" }
 rlp_compress = { path = "../util/rlp-compress" }
 serde_json = "1.0"
 tempdir = "0.3"
 trie-standardmap = "0.12.4"
-machine = { path = "./machine", features = ["test-helpers"] }
 
 [features]
 parity = ["work-notify", "price-info", "stratum"]

ethcore/client-traits/Cargo.toml

@@ -7,6 +7,15 @@ edition = "2018"
 license = "GPL-3.0"
 
 [dependencies]
-ethereum-types = "0.6.0"
+account-state = { path = "../account-state" }
+blockchain = { package = "ethcore-blockchain", path = "../blockchain" }
+bytes = { package = "parity-bytes", version = "0.1.0" }
+call-contract = { package = "ethcore-call-contract", path = "../call-contract" }
 common-types = { path = "../types" }
-
+ethcore-db = { path = "../db" }
+ethcore-miner = { path = "../../miner" }
+ethereum-types = "0.6.0"
+kvdb = "0.1.0"
+stats = { path = "../../util/stats" }
+trace = { path = "../trace" }
+vm = { path = "../vm" }