Move a bunch of stuff around (#10101)

* Move devtools.

* Merge stop_guard & rename memzero

* Move price-info to miner.

* Group account management

* Clean up workspace members.

* Move local store closer to miner.

* Move clib examples.

* Move registrar and hash-fetch

* Move rpc_cli/rpc_client

* Move stratum closer to miner.

* Fix naming convention of crates.

* Update Cpp examples path.

* Fix paths for clib-example.

* Fix removing build.

Cargo.lock

@@ -247,6 +247,16 @@ dependencies = [
  "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cli-signer"
+version = "1.4.0"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-rpc 1.12.0",
+ "parity-rpc-client 1.4.0",
+ "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -736,7 +746,6 @@ dependencies = [
  "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "stats 0.1.0",
- "stop-guard 0.1.0",
  "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "trace-time 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "trie-standardmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -754,10 +763,6 @@ dependencies = [
  "siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "ethcore-devtools"
-version = "1.12.0"
-
 [[package]]
 name = "ethcore-io"
 version = "1.12.0"
@@ -999,7 +1004,6 @@ dependencies = [
  "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb-rocksdb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "stop-guard 0.1.0",
  "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "trace-time 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1111,7 +1115,7 @@ dependencies = [
  "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "mem 0.1.0",
+ "memzero 0.1.0",
  "parity-crypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-wordlist 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2006,10 +2010,6 @@ name = "matches"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "mem"
-version = "0.1.0"
-
 [[package]]
 name = "memchr"
 version = "2.1.0"
@@ -2058,6 +2058,10 @@ dependencies = [
  "rlp 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "memzero"
+version = "0.1.0"
+
 [[package]]
 name = "migration-rocksdb"
 version = "0.1.0"
@@ -2348,6 +2352,7 @@ dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "blooms-db 0.1.0",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cli-signer 1.4.0",
  "ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)",
  "daemonize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dir 0.1.2",
@@ -2376,7 +2381,6 @@ dependencies = [
  "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb-rocksdb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "mem 0.1.0",
  "migration-rocksdb 0.1.0",
  "node-filter 1.12.0",
  "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2388,7 +2392,6 @@ dependencies = [
  "parity-local-store 0.1.0",
  "parity-path 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-rpc 1.12.0",
- "parity-rpc-client 1.4.0",
  "parity-runtime 0.1.0",
  "parity-updater 1.12.0",
  "parity-version 2.3.0",
@@ -2399,7 +2402,6 @@ dependencies = [
  "registrar 0.0.1",
  "rlp 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rpc-cli 1.4.0",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2510,7 +2512,6 @@ dependencies = [
  "eip712 0.1.0",
  "ethash 1.12.0",
  "ethcore 1.12.0",
- "ethcore-devtools 1.12.0",
  "ethcore-io 1.12.0",
  "ethcore-light 1.12.0",
  "ethcore-logger 1.12.0",
@@ -2685,7 +2686,7 @@ dependencies = [
  "jsonrpc-macros 9.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-2.2)",
  "jsonrpc-pubsub 9.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-2.2)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "mem 0.1.0",
+ "memzero 0.1.0",
  "ordered-float 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-crypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3249,16 +3250,6 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rpc-cli"
-version = "1.4.0"
-dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-rpc 1.12.0",
- "parity-rpc-client 1.4.0",
- "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rprompt"
 version = "1.0.3"
@@ -3497,10 +3488,6 @@ dependencies = [
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "stop-guard"
-version = "0.1.0"
-
 [[package]]
 name = "string"
 version = "0.1.1"

Cargo.toml

@@ -43,32 +43,30 @@ ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
 ethcore-transaction = { path = "ethcore/transaction" }
 ethereum-types = "0.4"
-node-filter = { path = "ethcore/node_filter" }
-ethkey = { path = "ethkey" }
+node-filter = { path = "ethcore/node-filter" }
+ethkey = { path = "accounts/ethkey" }
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rpc-cli = { path = "rpc_cli" }
-parity-hash-fetch = { path = "hash-fetch" }
+cli-signer= { path = "cli-signer" }
+parity-hash-fetch = { path = "updater/hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-local-store = { path = "local-store" }
+parity-local-store = { path = "miner/local-store" }
 parity-runtime = { path = "util/runtime" }
 parity-rpc = { path = "rpc" }
-parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
 parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
 parity-path = "0.1"
 dir = { path = "util/dir" }
-panic_hook = { path = "util/panic_hook" }
+panic_hook = { path = "util/panic-hook" }
 keccak-hash = "0.1"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.3"
 journaldb = { path = "util/journaldb" }
-mem = { path = "util/mem" }
 
-ethcore-secretstore = { path = "secret_store", optional = true }
+ethcore-secretstore = { path = "secret-store", optional = true }
 
-registrar = { path = "registrar" }
+registrar = { path = "util/registrar" }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -121,19 +119,15 @@ name = "parity"
 debug = false
 
 [workspace]
+# This should only list projects that are not
+# in the dependency tree in any other way
+# (i.e. pretty much only standalone CLI tools)
 members = [
+	"accounts/ethkey/cli",
+	"accounts/ethstore/cli",
 	"chainspec",
 	"ethcore/wasm/run",
-	"ethcore/types",
-	"ethkey/cli",
-	"ethstore/cli",
 	"evmbin",
-	"miner",
 	"parity-clib",
-	"whisper",
 	"whisper/cli",
-	"util/triehash-ethereum",
-	"util/keccak-hasher",
-	"util/patricia-trie-ethereum",
-	"util/fastmap",
 ]

accounts/ethkey/Cargo.toml

@@ -11,7 +11,7 @@ eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
 ethereum-types = "0.4"
 lazy_static = "1.0"
 log = "0.4"
-mem = { path = "../util/mem" }
+memzero = { path = "../../util/memzero" }
 parity-wordlist = "1.2"
 quick-error = "1.2.2"
 rand = "0.4"

accounts/ethkey/cli/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 docopt = "1.0"
 env_logger = "0.5"
 ethkey = { path = "../" }
-panic_hook = { path = "../../util/panic_hook" }
+panic_hook = { path = "../../../util/panic-hook" }
 parity-wordlist="1.2"
 rustc-hex = "1.0"
 serde = "1.0"

accounts/ethkey/src/lib.rs

@@ -20,7 +20,7 @@ extern crate byteorder;
 extern crate edit_distance;
 extern crate parity_crypto;
 extern crate ethereum_types;
-extern crate mem;
+extern crate memzero;
 extern crate parity_wordlist;
 #[macro_use]
 extern crate quick_error;

accounts/ethkey/src/secret.rs

@@ -21,7 +21,7 @@ use rustc_hex::ToHex;
 use secp256k1::constants::{SECRET_KEY_SIZE as SECP256K1_SECRET_KEY_SIZE};
 use secp256k1::key;
 use ethereum_types::H256;
-use mem::Memzero;
+use memzero::Memzero;
 use {Error, SECP256K1};
 
 #[derive(Clone, PartialEq, Eq)]

accounts/ethstore/Cargo.toml

@@ -18,7 +18,7 @@ itertools = "0.5"
 parking_lot = "0.7"
 parity-crypto = "0.2"
 ethereum-types = "0.4"
-dir = { path = "../util/dir" }
+dir = { path = "../../util/dir" }
 smallvec = "0.6"
 parity-wordlist = "1.0"
 tempdir = "0.3"

accounts/ethstore/cli/Cargo.toml

@@ -11,8 +11,8 @@ serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.7"
 ethstore = { path = "../" }
-dir = { path = '../../util/dir' }
-panic_hook = { path = "../../util/panic_hook" }
+dir = { path = '../../../util/dir' }
+panic_hook = { path = "../../../util/panic-hook" }
 
 [[bin]]
 name = "ethstore"

accounts/fake-hardware-wallet/Cargo.toml

@@ -7,4 +7,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ethereum-types = "0.4"
-ethkey = { path = "../../ethkey" }
+ethkey = { path = "../../accounts/ethkey" }

cli-signer/Cargo.toml

@@ -3,11 +3,11 @@ authors = ["Parity <admin@parity.io>"]
 description = "Parity Cli Tool"
 homepage = "http://parity.io"
 license = "GPL-3.0"
-name = "rpc-cli"
+name = "cli-signer"
 version = "1.4.0"
 
 [dependencies]
 futures = "0.1"
 rpassword = "1.0"
 parity-rpc = { path = "../rpc" }
-parity-rpc-client = { path = "../rpc_client" }
+parity-rpc-client = { path = "rpc-client" }

cli-signer/rpc-client/Cargo.toml

@@ -16,5 +16,5 @@ matches = "0.1"
 parking_lot = "0.7"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
 jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
-parity-rpc = { path = "../rpc" }
+parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.1"

devtools/Cargo.toml

@@ -1,7 +0,0 @@
-[package]
-description = "Ethcore development/test/build tools"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-devtools"
-version = "1.12.0"
-authors = ["Parity Technologies <admin@parity.io>"]

devtools/src/lib.rs

@@ -1,19 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! dev-tools
-
-pub mod http_client;

ethcore/Cargo.toml

@@ -25,16 +25,16 @@ error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
-ethcore-stratum = { path = "./stratum", optional = true }
+ethcore-stratum = { path = "../miner/stratum", optional = true }
 ethcore-transaction = { path = "./transaction" }
 ethereum-types = "0.4"
-memory-cache = { path = "../util/memory_cache" }
+memory-cache = { path = "../util/memory-cache" }
 ethabi = "6.0"
 ethabi-derive = "6.0"
 ethabi-contract = "6.0"
 ethjson = { path = "../json" }
-ethkey = { path = "../ethkey" }
-ethstore = { path = "../ethstore" }
+ethkey = { path = "../accounts/ethkey" }
+ethstore = { path = "../accounts/ethstore" }
 evm = { path = "evm" }
 heapsize = "0.4"
 itertools = "0.5"
@@ -48,17 +48,16 @@ parking_lot = "0.7"
 rayon = "1.0"
 rand = "0.4"
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_compress = { path = "../util/rlp_compress" }
-rlp_derive = { path = "../util/rlp_derive" }
+rlp_compress = { path = "../util/rlp-compress" }
+rlp_derive = { path = "../util/rlp-derive" }
 kvdb = "0.1"
 kvdb-memorydb = "0.1"
 parity-snappy = "0.1"
-stop-guard = { path = "../util/stop-guard" }
 macros = { path = "../util/macros" }
 rustc-hex = "1.0"
 stats = { path = "../util/stats" }
 trace-time = "0.1"
-using_queue = { path = "../util/using_queue" }
+using_queue = { path = "../miner/using-queue" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
 keccak-hash = "0.1"
@@ -73,10 +72,10 @@ tempdir = {version="0.3", optional = true}
 len-caching-lock = { path = "../util/len-caching-lock" }
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
-hardware-wallet = { path = "../hw" }
+hardware-wallet = { path = "../accounts/hw" }
 
 [target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android")))'.dependencies]
-fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }
+fake-hardware-wallet = { path = "../accounts/fake-hardware-wallet" }
 
 [dev-dependencies]
 env_logger = "0.4"

ethcore/evm/Cargo.toml

@@ -13,7 +13,7 @@ log = "0.4"
 vm = { path = "../vm" }
 keccak-hash = "0.1"
 parking_lot = "0.7"
-memory-cache = { path = "../../util/memory_cache" }
+memory-cache = { path = "../../util/memory-cache" }
 
 [dev-dependencies]
 rustc-hex = "1.0"

ethcore/light/Cargo.toml

@@ -23,7 +23,7 @@ vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
 failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] }
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_derive = { path = "../../util/rlp_derive" }
+rlp_derive = { path = "../../util/rlp-derive" }
 smallvec = "0.6"
 futures = "0.1"
 rand = "0.4"
@@ -37,7 +37,7 @@ keccak-hash = "0.1"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
 kvdb = "0.1"
-memory-cache = { path = "../../util/memory_cache" }
+memory-cache = { path = "../../util/memory-cache" }
 error-chain = { version = "0.12", default-features = false }
 
 [dev-dependencies]

ethcore/private-tx/Cargo.toml

@@ -19,7 +19,7 @@ ethcore-miner = { path = "../../miner" }
 ethcore-transaction = { path = "../transaction" }
 ethereum-types = "0.4"
 ethjson = { path = "../../json" }
-ethkey = { path = "../../ethkey" }
+ethkey = { path = "../../accounts/ethkey" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
 heapsize = "0.4"
@@ -30,7 +30,7 @@ patricia-trie = "0.3.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_derive = { path = "../../util/rlp_derive" }
+rlp_derive = { path = "../../util/rlp-derive" }
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"

ethcore/service/Cargo.toml

@@ -13,7 +13,6 @@ ethcore-sync = { path = "../sync" }
 ethereum-types = "0.4"
 kvdb = "0.1"
 log = "0.4"
-stop-guard = { path = "../../util/stop-guard" }
 trace-time = "0.1"
 
 [dev-dependencies]

ethcore/service/src/lib.rs

@@ -21,7 +21,6 @@ extern crate ethcore_private_tx;
 extern crate ethcore_sync as sync;
 extern crate ethereum_types;
 extern crate kvdb;
-extern crate stop_guard;
 
 #[macro_use]
 extern crate error_chain;
@@ -37,6 +36,7 @@ extern crate tempdir;
 
 mod error;
 mod service;
+mod stop_guard;
 
 #[cfg(test)]
 extern crate kvdb_rocksdb;

ethcore/service/src/stop_guard.rs

@@ -31,11 +31,6 @@ impl StopGuard {
 			flag: Arc::new(AtomicBool::new(false))
 		}
 	}
-
-	/// Share stop guard between the threads
-	pub fn share(&self) -> Arc<AtomicBool> {
-		self.flag.clone()
-	}
 }
 
 impl Drop for StopGuard {

ethcore/src/lib.rs

@@ -103,7 +103,6 @@ extern crate parity_snappy as snappy;
 extern crate ethabi;
 extern crate rustc_hex;
 extern crate stats;
-extern crate stop_guard;
 extern crate using_queue;
 extern crate vm;
 extern crate wasm;

ethcore/sync/Cargo.toml

@@ -34,7 +34,7 @@ trace-time = "0.1"
 
 [dev-dependencies]
 ethcore-io = { path = "../../util/io", features = ["mio"] }
-ethkey = { path = "../../ethkey" }
+ethkey = { path = "../../accounts/ethkey" }
 kvdb-memorydb = "0.1"
 ethcore-private-tx = { path = "../private-tx" }
 ethcore = { path = "..", features = ["test-helpers"] }