Extract spec to own crate

Cargo.toml

@@ -7,32 +7,16 @@ license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-blooms-db = { path = "util/blooms-db" }
-log = "0.4"
-rustc-hex = "1.0"
-docopt = "1.0"
-clap = "2"
-term_size = "0.3"
-textwrap = "0.9"
-num_cpus = "1.2"
-number_prefix = "0.2"
-rpassword = "1.0"
-semver = "0.9"
 ansi_term = "0.11"
-parking_lot = "0.8"
-regex = "1.0"
 atty = "0.2.8"
-toml = "0.4"
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
-futures = "0.1"
-fdlimit = "0.1"
-ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = "12.0.0"
-parity-bytes = "0.1"
+blooms-db = { path = "util/blooms-db" }
+clap = "2"
+cli-signer= { path = "cli-signer" }
 client-traits = { path = "ethcore/client-traits" }
 common-types = { path = "ethcore/types" }
+ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
+dir = { path = "util/dir" }
+docopt = "1.0"
 engine = { path = "ethcore/engine" }
 ethcore = { path = "ethcore", features = ["parity"] }
 ethcore-accounts = { path = "accounts", optional = true }
@@ -45,36 +29,50 @@ ethcore-logger = { path = "parity/logger" }
 ethcore-miner = { path = "miner" }
 ethcore-network = { path = "util/network" }
 ethcore-private-tx = { path = "ethcore/private-tx" }
+ethcore-secretstore = { path = "secret-store", optional = true }
 ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
 ethereum-types = "0.6.0"
 ethkey = { path = "accounts/ethkey" }
 ethstore = { path = "accounts/ethstore" }
+fdlimit = "0.1"
+futures = "0.1"
+journaldb = { path = "util/journaldb" }
+jsonrpc-core = "12.0.0"
+keccak-hash = "0.2.0"
+kvdb = "0.1"
+kvdb-rocksdb = "0.1.3"
+log = "0.4"
+migration-rocksdb = { path = "util/migration-rocksdb" }
 node-filter = { path = "ethcore/node-filter" }
-rlp = "0.4.0"
-cli-signer= { path = "cli-signer" }
+num_cpus = "1.2"
+number_prefix = "0.2"
+panic_hook = { path = "util/panic-hook" }
+parity-bytes = "0.1"
 parity-daemonize = "0.3"
 parity-hash-fetch = { path = "updater/hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
 parity-local-store = { path = "miner/local-store" }
-parity-runtime = { path = "util/runtime" }
+parity-path = "0.1"
 parity-rpc = { path = "rpc" }
+parity-runtime = { path = "util/runtime" }
 parity-updater = { path = "updater" }
+parity-util-mem = { version = "0.2.0", features = ["jemalloc-global"] }
 parity-version = { path = "util/version" }
-parity-path = "0.1"
-dir = { path = "util/dir" }
-panic_hook = { path = "util/panic-hook" }
-keccak-hash = "0.2.0"
-migration-rocksdb = { path = "util/migration-rocksdb" }
-kvdb = "0.1"
-kvdb-rocksdb = "0.1.3"
-journaldb = { path = "util/journaldb" }
-
-ethcore-secretstore = { path = "secret-store", optional = true }
-
+parking_lot = "0.8"
+regex = "1.0"
 registrar = { path = "util/registrar" }
-
-parity-util-mem = { version = "0.2.0", features = ["jemalloc-global"] }
+rlp = "0.4.0"
+rpassword = "1.0"
+rustc-hex = "1.0"
+semver = "0.9"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+spec = { path = "ethcore/spec" }
+term_size = "0.3"
+textwrap = "0.9"
+toml = "0.4"
 
 [build-dependencies]
 rustc_version = "0.2"

ethash/Cargo.toml

@@ -5,6 +5,7 @@ version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
+common-types = { path = "../ethcore/types" }
 crunchy = "0.1.0"
 either = "1.0.0"
 ethereum-types = "0.6.0"

ethash/benches/basic.rs

@@ -17,9 +17,11 @@
 #[macro_use]
 extern crate criterion;
 extern crate ethash;
+extern crate common_types;
 
 use criterion::Criterion;
-use ethash::{NodeCacheBuilder, OptimizeFor};
+use ethash::NodeCacheBuilder;
+use common_types::engines::OptimizeFor;
 
 const HASH: [u8; 32] = [
 	0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b,

ethash/benches/progpow.rs

@@ -3,14 +3,16 @@ extern crate criterion;
 extern crate ethash;
 extern crate rustc_hex;
 extern crate tempdir;
+extern crate common_types;
 
 use criterion::Criterion;
 use ethash::progpow;
 
 use tempdir::TempDir;
 use rustc_hex::FromHex;
-use ethash::{NodeCacheBuilder, OptimizeFor};
+use ethash::NodeCacheBuilder;
 use ethash::compute::light_compute;
+use common_types::engines::OptimizeFor;
 
 fn bench_hashimoto_light(c: &mut Criterion) {
 	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());

ethash/src/cache.rs

@@ -30,19 +30,9 @@ use std::path::{Path, PathBuf};
 use std::slice;
 use std::sync::Arc;
 
-type Cache = Either<Vec<Node>, MmapMut>;
-
-#[derive(PartialEq, Eq, Debug, Clone, Copy)]
-pub enum OptimizeFor {
-	Cpu,
-	Memory,
-}
+use common_types::engines::OptimizeFor;
 
-impl Default for OptimizeFor {
-	fn default() -> Self {
-		OptimizeFor::Cpu
-	}
-}
+type Cache = Either<Vec<Node>, MmapMut>;
 
 fn byte_size(cache: &Cache) -> usize {
 	use self::Either::{Left, Right};