diff --git a/Cargo.lock b/Cargo.lock index 97e0119b5..291527151 100644 --- a/Cargo.lock +++ b/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" diff --git a/Cargo.toml b/Cargo.toml index e6d41dea0..498694554 100644 --- a/Cargo.toml +++ b/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", ] diff --git a/ethkey/.gitignore b/accounts/ethkey/.gitignore similarity index 100% rename from ethkey/.gitignore rename to accounts/ethkey/.gitignore diff --git a/ethkey/.travis.yml b/accounts/ethkey/.travis.yml similarity index 100% rename from ethkey/.travis.yml rename to accounts/ethkey/.travis.yml diff --git a/ethkey/Cargo.toml b/accounts/ethkey/Cargo.toml similarity index 91% rename from ethkey/Cargo.toml rename to accounts/ethkey/Cargo.toml index 536e5b47d..3dddcc1ce 100644 --- a/ethkey/Cargo.toml +++ b/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" diff --git a/ethkey/README.md b/accounts/ethkey/README.md similarity index 100% rename from ethkey/README.md rename to accounts/ethkey/README.md diff --git a/ethkey/cli/Cargo.toml b/accounts/ethkey/cli/Cargo.toml similarity index 86% rename from ethkey/cli/Cargo.toml rename to accounts/ethkey/cli/Cargo.toml index 90b5b8e14..d43aa2c5c 100644 --- a/ethkey/cli/Cargo.toml +++ b/accounts/ethkey/cli/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Parity Technologies "] 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" diff --git a/ethkey/cli/src/main.rs b/accounts/ethkey/cli/src/main.rs similarity index 100% rename from ethkey/cli/src/main.rs rename to accounts/ethkey/cli/src/main.rs diff --git a/ethkey/src/brain.rs b/accounts/ethkey/src/brain.rs similarity index 100% rename from ethkey/src/brain.rs rename to accounts/ethkey/src/brain.rs diff --git a/ethkey/src/brain_prefix.rs b/accounts/ethkey/src/brain_prefix.rs similarity index 100% rename from ethkey/src/brain_prefix.rs rename to accounts/ethkey/src/brain_prefix.rs diff --git a/ethkey/src/brain_recover.rs b/accounts/ethkey/src/brain_recover.rs similarity index 100% rename from ethkey/src/brain_recover.rs rename to accounts/ethkey/src/brain_recover.rs diff --git a/ethkey/src/crypto.rs b/accounts/ethkey/src/crypto.rs similarity index 100% rename from ethkey/src/crypto.rs rename to accounts/ethkey/src/crypto.rs diff --git a/ethkey/src/error.rs b/accounts/ethkey/src/error.rs similarity index 100% rename from ethkey/src/error.rs rename to accounts/ethkey/src/error.rs diff --git a/ethkey/src/extended.rs b/accounts/ethkey/src/extended.rs similarity index 100% rename from ethkey/src/extended.rs rename to accounts/ethkey/src/extended.rs diff --git a/ethkey/src/keccak.rs b/accounts/ethkey/src/keccak.rs similarity index 100% rename from ethkey/src/keccak.rs rename to accounts/ethkey/src/keccak.rs diff --git a/ethkey/src/keypair.rs b/accounts/ethkey/src/keypair.rs similarity index 100% rename from ethkey/src/keypair.rs rename to accounts/ethkey/src/keypair.rs diff --git a/ethkey/src/lib.rs b/accounts/ethkey/src/lib.rs similarity index 99% rename from ethkey/src/lib.rs rename to accounts/ethkey/src/lib.rs index 013a60cd3..625af7969 100644 --- a/ethkey/src/lib.rs +++ b/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; diff --git a/ethkey/src/math.rs b/accounts/ethkey/src/math.rs similarity index 100% rename from ethkey/src/math.rs rename to accounts/ethkey/src/math.rs diff --git a/ethkey/src/password.rs b/accounts/ethkey/src/password.rs similarity index 100% rename from ethkey/src/password.rs rename to accounts/ethkey/src/password.rs diff --git a/ethkey/src/prefix.rs b/accounts/ethkey/src/prefix.rs similarity index 100% rename from ethkey/src/prefix.rs rename to accounts/ethkey/src/prefix.rs diff --git a/ethkey/src/random.rs b/accounts/ethkey/src/random.rs similarity index 100% rename from ethkey/src/random.rs rename to accounts/ethkey/src/random.rs diff --git a/ethkey/src/secret.rs b/accounts/ethkey/src/secret.rs similarity index 99% rename from ethkey/src/secret.rs rename to accounts/ethkey/src/secret.rs index a3560698a..fde1c3e9d 100644 --- a/ethkey/src/secret.rs +++ b/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)] diff --git a/ethkey/src/signature.rs b/accounts/ethkey/src/signature.rs similarity index 100% rename from ethkey/src/signature.rs rename to accounts/ethkey/src/signature.rs diff --git a/ethstore/.editorconfig b/accounts/ethstore/.editorconfig similarity index 100% rename from ethstore/.editorconfig rename to accounts/ethstore/.editorconfig diff --git a/ethstore/.gitignore b/accounts/ethstore/.gitignore similarity index 100% rename from ethstore/.gitignore rename to accounts/ethstore/.gitignore diff --git a/ethstore/.travis.yml b/accounts/ethstore/.travis.yml similarity index 100% rename from ethstore/.travis.yml rename to accounts/ethstore/.travis.yml diff --git a/ethstore/Cargo.toml b/accounts/ethstore/Cargo.toml similarity index 93% rename from ethstore/Cargo.toml rename to accounts/ethstore/Cargo.toml index e16eadc44..384a06acb 100644 --- a/ethstore/Cargo.toml +++ b/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" diff --git a/ethstore/README.md b/accounts/ethstore/README.md similarity index 100% rename from ethstore/README.md rename to accounts/ethstore/README.md diff --git a/ethstore/cli/Cargo.toml b/accounts/ethstore/cli/Cargo.toml similarity index 79% rename from ethstore/cli/Cargo.toml rename to accounts/ethstore/cli/Cargo.toml index c6a4f75da..c1a2ee6d1 100644 --- a/ethstore/cli/Cargo.toml +++ b/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" diff --git a/ethstore/cli/src/crack.rs b/accounts/ethstore/cli/src/crack.rs similarity index 100% rename from ethstore/cli/src/crack.rs rename to accounts/ethstore/cli/src/crack.rs diff --git a/ethstore/cli/src/main.rs b/accounts/ethstore/cli/src/main.rs similarity index 100% rename from ethstore/cli/src/main.rs rename to accounts/ethstore/cli/src/main.rs diff --git a/ethstore/cli/tests/cli.rs b/accounts/ethstore/cli/tests/cli.rs similarity index 100% rename from ethstore/cli/tests/cli.rs rename to accounts/ethstore/cli/tests/cli.rs diff --git a/ethstore/src/account/cipher.rs b/accounts/ethstore/src/account/cipher.rs similarity index 100% rename from ethstore/src/account/cipher.rs rename to accounts/ethstore/src/account/cipher.rs diff --git a/ethstore/src/account/crypto.rs b/accounts/ethstore/src/account/crypto.rs similarity index 100% rename from ethstore/src/account/crypto.rs rename to accounts/ethstore/src/account/crypto.rs diff --git a/ethstore/src/account/kdf.rs b/accounts/ethstore/src/account/kdf.rs similarity index 100% rename from ethstore/src/account/kdf.rs rename to accounts/ethstore/src/account/kdf.rs diff --git a/ethstore/src/account/mod.rs b/accounts/ethstore/src/account/mod.rs similarity index 100% rename from ethstore/src/account/mod.rs rename to accounts/ethstore/src/account/mod.rs diff --git a/ethstore/src/account/safe_account.rs b/accounts/ethstore/src/account/safe_account.rs similarity index 100% rename from ethstore/src/account/safe_account.rs rename to accounts/ethstore/src/account/safe_account.rs diff --git a/ethstore/src/account/version.rs b/accounts/ethstore/src/account/version.rs similarity index 100% rename from ethstore/src/account/version.rs rename to accounts/ethstore/src/account/version.rs diff --git a/ethstore/src/accounts_dir/disk.rs b/accounts/ethstore/src/accounts_dir/disk.rs similarity index 100% rename from ethstore/src/accounts_dir/disk.rs rename to accounts/ethstore/src/accounts_dir/disk.rs diff --git a/ethstore/src/accounts_dir/memory.rs b/accounts/ethstore/src/accounts_dir/memory.rs similarity index 100% rename from ethstore/src/accounts_dir/memory.rs rename to accounts/ethstore/src/accounts_dir/memory.rs diff --git a/ethstore/src/accounts_dir/mod.rs b/accounts/ethstore/src/accounts_dir/mod.rs similarity index 100% rename from ethstore/src/accounts_dir/mod.rs rename to accounts/ethstore/src/accounts_dir/mod.rs diff --git a/ethstore/src/accounts_dir/vault.rs b/accounts/ethstore/src/accounts_dir/vault.rs similarity index 100% rename from ethstore/src/accounts_dir/vault.rs rename to accounts/ethstore/src/accounts_dir/vault.rs diff --git a/ethstore/src/error.rs b/accounts/ethstore/src/error.rs similarity index 100% rename from ethstore/src/error.rs rename to accounts/ethstore/src/error.rs diff --git a/ethstore/src/ethkey.rs b/accounts/ethstore/src/ethkey.rs similarity index 100% rename from ethstore/src/ethkey.rs rename to accounts/ethstore/src/ethkey.rs diff --git a/ethstore/src/ethstore.rs b/accounts/ethstore/src/ethstore.rs similarity index 100% rename from ethstore/src/ethstore.rs rename to accounts/ethstore/src/ethstore.rs diff --git a/ethstore/src/import.rs b/accounts/ethstore/src/import.rs similarity index 100% rename from ethstore/src/import.rs rename to accounts/ethstore/src/import.rs diff --git a/ethstore/src/json/bytes.rs b/accounts/ethstore/src/json/bytes.rs similarity index 100% rename from ethstore/src/json/bytes.rs rename to accounts/ethstore/src/json/bytes.rs diff --git a/ethstore/src/json/cipher.rs b/accounts/ethstore/src/json/cipher.rs similarity index 100% rename from ethstore/src/json/cipher.rs rename to accounts/ethstore/src/json/cipher.rs diff --git a/ethstore/src/json/crypto.rs b/accounts/ethstore/src/json/crypto.rs similarity index 100% rename from ethstore/src/json/crypto.rs rename to accounts/ethstore/src/json/crypto.rs diff --git a/ethstore/src/json/error.rs b/accounts/ethstore/src/json/error.rs similarity index 100% rename from ethstore/src/json/error.rs rename to accounts/ethstore/src/json/error.rs diff --git a/ethstore/src/json/hash.rs b/accounts/ethstore/src/json/hash.rs similarity index 100% rename from ethstore/src/json/hash.rs rename to accounts/ethstore/src/json/hash.rs diff --git a/ethstore/src/json/id.rs b/accounts/ethstore/src/json/id.rs similarity index 100% rename from ethstore/src/json/id.rs rename to accounts/ethstore/src/json/id.rs diff --git a/ethstore/src/json/kdf.rs b/accounts/ethstore/src/json/kdf.rs similarity index 100% rename from ethstore/src/json/kdf.rs rename to accounts/ethstore/src/json/kdf.rs diff --git a/ethstore/src/json/key_file.rs b/accounts/ethstore/src/json/key_file.rs similarity index 100% rename from ethstore/src/json/key_file.rs rename to accounts/ethstore/src/json/key_file.rs diff --git a/ethstore/src/json/mod.rs b/accounts/ethstore/src/json/mod.rs similarity index 100% rename from ethstore/src/json/mod.rs rename to accounts/ethstore/src/json/mod.rs diff --git a/ethstore/src/json/presale.rs b/accounts/ethstore/src/json/presale.rs similarity index 100% rename from ethstore/src/json/presale.rs rename to accounts/ethstore/src/json/presale.rs diff --git a/ethstore/src/json/vault_file.rs b/accounts/ethstore/src/json/vault_file.rs similarity index 100% rename from ethstore/src/json/vault_file.rs rename to accounts/ethstore/src/json/vault_file.rs diff --git a/ethstore/src/json/vault_key_file.rs b/accounts/ethstore/src/json/vault_key_file.rs similarity index 100% rename from ethstore/src/json/vault_key_file.rs rename to accounts/ethstore/src/json/vault_key_file.rs diff --git a/ethstore/src/json/version.rs b/accounts/ethstore/src/json/version.rs similarity index 100% rename from ethstore/src/json/version.rs rename to accounts/ethstore/src/json/version.rs diff --git a/ethstore/src/lib.rs b/accounts/ethstore/src/lib.rs similarity index 100% rename from ethstore/src/lib.rs rename to accounts/ethstore/src/lib.rs diff --git a/ethstore/src/presale.rs b/accounts/ethstore/src/presale.rs similarity index 100% rename from ethstore/src/presale.rs rename to accounts/ethstore/src/presale.rs diff --git a/ethstore/src/random.rs b/accounts/ethstore/src/random.rs similarity index 100% rename from ethstore/src/random.rs rename to accounts/ethstore/src/random.rs diff --git a/ethstore/src/secret_store.rs b/accounts/ethstore/src/secret_store.rs similarity index 100% rename from ethstore/src/secret_store.rs rename to accounts/ethstore/src/secret_store.rs diff --git a/ethstore/tests/api.rs b/accounts/ethstore/tests/api.rs similarity index 100% rename from ethstore/tests/api.rs rename to accounts/ethstore/tests/api.rs diff --git a/ethstore/tests/res/ciphertext/30.json b/accounts/ethstore/tests/res/ciphertext/30.json similarity index 100% rename from ethstore/tests/res/ciphertext/30.json rename to accounts/ethstore/tests/res/ciphertext/30.json diff --git a/ethstore/tests/res/ciphertext/31.json b/accounts/ethstore/tests/res/ciphertext/31.json similarity index 100% rename from ethstore/tests/res/ciphertext/31.json rename to accounts/ethstore/tests/res/ciphertext/31.json diff --git a/ethstore/tests/res/geth_keystore/UTC--2016-02-17T09-20-45.721400158Z--3f49624084b67849c7b4e805c5988c21a430f9d9 b/accounts/ethstore/tests/res/geth_keystore/UTC--2016-02-17T09-20-45.721400158Z--3f49624084b67849c7b4e805c5988c21a430f9d9 similarity index 100% rename from ethstore/tests/res/geth_keystore/UTC--2016-02-17T09-20-45.721400158Z--3f49624084b67849c7b4e805c5988c21a430f9d9 rename to accounts/ethstore/tests/res/geth_keystore/UTC--2016-02-17T09-20-45.721400158Z--3f49624084b67849c7b4e805c5988c21a430f9d9 diff --git a/ethstore/tests/res/geth_keystore/UTC--2016-02-20T09-33-03.984382741Z--5ba4dcf897e97c2bdf8315b9ef26c13c085988cf b/accounts/ethstore/tests/res/geth_keystore/UTC--2016-02-20T09-33-03.984382741Z--5ba4dcf897e97c2bdf8315b9ef26c13c085988cf similarity index 100% rename from ethstore/tests/res/geth_keystore/UTC--2016-02-20T09-33-03.984382741Z--5ba4dcf897e97c2bdf8315b9ef26c13c085988cf rename to accounts/ethstore/tests/res/geth_keystore/UTC--2016-02-20T09-33-03.984382741Z--5ba4dcf897e97c2bdf8315b9ef26c13c085988cf diff --git a/ethstore/tests/res/geth_keystore/UTC--2016-04-03T08-58-49.834202900Z--63121b431a52f8043c16fcf0d1df9cb7b5f66649 b/accounts/ethstore/tests/res/geth_keystore/UTC--2016-04-03T08-58-49.834202900Z--63121b431a52f8043c16fcf0d1df9cb7b5f66649 similarity index 100% rename from ethstore/tests/res/geth_keystore/UTC--2016-04-03T08-58-49.834202900Z--63121b431a52f8043c16fcf0d1df9cb7b5f66649 rename to accounts/ethstore/tests/res/geth_keystore/UTC--2016-04-03T08-58-49.834202900Z--63121b431a52f8043c16fcf0d1df9cb7b5f66649 diff --git a/ethstore/tests/res/pat/p1.json b/accounts/ethstore/tests/res/pat/p1.json similarity index 100% rename from ethstore/tests/res/pat/p1.json rename to accounts/ethstore/tests/res/pat/p1.json diff --git a/ethstore/tests/res/pat/p2.json b/accounts/ethstore/tests/res/pat/p2.json similarity index 100% rename from ethstore/tests/res/pat/p2.json rename to accounts/ethstore/tests/res/pat/p2.json diff --git a/ethstore/tests/util/mod.rs b/accounts/ethstore/tests/util/mod.rs similarity index 100% rename from ethstore/tests/util/mod.rs rename to accounts/ethstore/tests/util/mod.rs diff --git a/ethstore/tests/util/transient_dir.rs b/accounts/ethstore/tests/util/transient_dir.rs similarity index 100% rename from ethstore/tests/util/transient_dir.rs rename to accounts/ethstore/tests/util/transient_dir.rs diff --git a/util/fake-hardware-wallet/Cargo.toml b/accounts/fake-hardware-wallet/Cargo.toml similarity index 84% rename from util/fake-hardware-wallet/Cargo.toml rename to accounts/fake-hardware-wallet/Cargo.toml index 5325c7733..5e20d8a6d 100644 --- a/util/fake-hardware-wallet/Cargo.toml +++ b/accounts/fake-hardware-wallet/Cargo.toml @@ -7,4 +7,4 @@ authors = ["Parity Technologies "] [dependencies] ethereum-types = "0.4" -ethkey = { path = "../../ethkey" } +ethkey = { path = "../../accounts/ethkey" } diff --git a/util/fake-hardware-wallet/src/lib.rs b/accounts/fake-hardware-wallet/src/lib.rs similarity index 100% rename from util/fake-hardware-wallet/src/lib.rs rename to accounts/fake-hardware-wallet/src/lib.rs diff --git a/hw/Cargo.toml b/accounts/hw/Cargo.toml similarity index 100% rename from hw/Cargo.toml rename to accounts/hw/Cargo.toml diff --git a/hw/src/ledger.rs b/accounts/hw/src/ledger.rs similarity index 100% rename from hw/src/ledger.rs rename to accounts/hw/src/ledger.rs diff --git a/hw/src/lib.rs b/accounts/hw/src/lib.rs similarity index 100% rename from hw/src/lib.rs rename to accounts/hw/src/lib.rs diff --git a/hw/src/trezor.rs b/accounts/hw/src/trezor.rs similarity index 100% rename from hw/src/trezor.rs rename to accounts/hw/src/trezor.rs diff --git a/rpc_cli/Cargo.toml b/cli-signer/Cargo.toml similarity index 78% rename from rpc_cli/Cargo.toml rename to cli-signer/Cargo.toml index 7d4652c38..f4fa86d94 100644 --- a/rpc_cli/Cargo.toml +++ b/cli-signer/Cargo.toml @@ -3,11 +3,11 @@ authors = ["Parity "] 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" } diff --git a/rpc_client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml similarity index 93% rename from rpc_client/Cargo.toml rename to cli-signer/rpc-client/Cargo.toml index d105f72f9..0ffdae770 100644 --- a/rpc_client/Cargo.toml +++ b/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" diff --git a/rpc_client/src/client.rs b/cli-signer/rpc-client/src/client.rs similarity index 100% rename from rpc_client/src/client.rs rename to cli-signer/rpc-client/src/client.rs diff --git a/rpc_client/src/lib.rs b/cli-signer/rpc-client/src/lib.rs similarity index 100% rename from rpc_client/src/lib.rs rename to cli-signer/rpc-client/src/lib.rs diff --git a/rpc_client/src/signer_client.rs b/cli-signer/rpc-client/src/signer_client.rs similarity index 100% rename from rpc_client/src/signer_client.rs rename to cli-signer/rpc-client/src/signer_client.rs diff --git a/rpc_cli/src/lib.rs b/cli-signer/src/lib.rs similarity index 100% rename from rpc_cli/src/lib.rs rename to cli-signer/src/lib.rs diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml deleted file mode 100644 index 71eeaa2dd..000000000 --- a/devtools/Cargo.toml +++ /dev/null @@ -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 "] diff --git a/devtools/src/lib.rs b/devtools/src/lib.rs deleted file mode 100644 index 6fdbc8d89..000000000 --- a/devtools/src/lib.rs +++ /dev/null @@ -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 . - -//! dev-tools - -pub mod http_client; diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index 308769cf5..8eb132014 100644 --- a/ethcore/Cargo.toml +++ b/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" diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml index 830134dce..cb70c42e4 100644 --- a/ethcore/evm/Cargo.toml +++ b/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" diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index a0b0afa0b..2cef2fbe7 100644 --- a/ethcore/light/Cargo.toml +++ b/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] diff --git a/ethcore/node_filter/Cargo.toml b/ethcore/node-filter/Cargo.toml similarity index 100% rename from ethcore/node_filter/Cargo.toml rename to ethcore/node-filter/Cargo.toml diff --git a/ethcore/node_filter/res/node_filter.json b/ethcore/node-filter/res/node_filter.json similarity index 100% rename from ethcore/node_filter/res/node_filter.json rename to ethcore/node-filter/res/node_filter.json diff --git a/ethcore/node_filter/res/peer_set.json b/ethcore/node-filter/res/peer_set.json similarity index 100% rename from ethcore/node_filter/res/peer_set.json rename to ethcore/node-filter/res/peer_set.json diff --git a/ethcore/node_filter/src/lib.rs b/ethcore/node-filter/src/lib.rs similarity index 100% rename from ethcore/node_filter/src/lib.rs rename to ethcore/node-filter/src/lib.rs diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml index 61abb39fc..d30a161dd 100644 --- a/ethcore/private-tx/Cargo.toml +++ b/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" diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml index 4eb4c940c..9ccacb713 100644 --- a/ethcore/service/Cargo.toml +++ b/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] diff --git a/ethcore/service/src/lib.rs b/ethcore/service/src/lib.rs index 7ded2af79..8f45c50ef 100644 --- a/ethcore/service/src/lib.rs +++ b/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; diff --git a/util/stop-guard/src/lib.rs b/ethcore/service/src/stop_guard.rs similarity index 91% rename from util/stop-guard/src/lib.rs rename to ethcore/service/src/stop_guard.rs index 208b57c6d..185644c35 100644 --- a/util/stop-guard/src/lib.rs +++ b/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 { - self.flag.clone() - } } impl Drop for StopGuard { diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs index 344f1fcc6..fd9dd217f 100644 --- a/ethcore/src/lib.rs +++ b/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; diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml index 234caf5ee..f185ef1ac 100644 --- a/ethcore/sync/Cargo.toml +++ b/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"] } diff --git a/ethcore/transaction/Cargo.toml b/ethcore/transaction/Cargo.toml index 1481f8716..5e5caef68 100644 --- a/ethcore/transaction/Cargo.toml +++ b/ethcore/transaction/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] [dependencies] ethjson = { path = "../../json" } -ethkey = { path = "../../ethkey" } +ethkey = { path = "../../accounts/ethkey" } evm = { path = "../evm" } heapsize = "0.4" keccak-hash = "0.1" diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml index 1833db871..2bedb093d 100644 --- a/ethcore/types/Cargo.toml +++ b/ethcore/types/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] [dependencies] rlp = { version = "0.3.0", features = ["ethereum"] } -rlp_derive = { path = "../../util/rlp_derive" } +rlp_derive = { path = "../../util/rlp-derive" } parity-bytes = "0.1" ethereum-types = "0.4" ethjson = { path = "../../json" } diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml index b75890f61..e75e2492c 100644 --- a/evmbin/Cargo.toml +++ b/evmbin/Cargo.toml @@ -17,7 +17,7 @@ parity-bytes = "0.1" ethcore-transaction = { path = "../ethcore/transaction" } ethereum-types = "0.4" evm = { path = "../ethcore/evm" } -panic_hook = { path = "../util/panic_hook" } +panic_hook = { path = "../util/panic-hook" } rustc-hex = "1.0" serde = "1.0" serde_derive = "1.0" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 29841c375..b1372e87b 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -25,14 +25,14 @@ keccak-hash = "0.1" linked-hash-map = "0.5" log = "0.4" parking_lot = "0.7" -price-info = { path = "../price-info", optional = true } +price-info = { path = "./price-info", optional = true } rlp = { version = "0.3.0", features = ["ethereum"] } trace-time = "0.1" transaction-pool = "1.13" [dev-dependencies] env_logger = "0.5" -ethkey = { path = "../ethkey" } +ethkey = { path = "../accounts/ethkey" } rustc-hex = "1.0" [features] diff --git a/local-store/Cargo.toml b/miner/local-store/Cargo.toml similarity index 58% rename from local-store/Cargo.toml rename to miner/local-store/Cargo.toml index b92ba4cc4..0198899dc 100644 --- a/local-store/Cargo.toml +++ b/miner/local-store/Cargo.toml @@ -5,9 +5,9 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -ethcore = { path = "../ethcore" } -ethcore-io = { path = "../util/io" } -ethcore-transaction = { path = "../ethcore/transaction" } +ethcore = { path = "../../ethcore" } +ethcore-io = { path = "../../util/io" } +ethcore-transaction = { path = "../../ethcore/transaction" } kvdb = "0.1" log = "0.4" rlp = { version = "0.3.0", features = ["ethereum"] } @@ -16,6 +16,6 @@ serde_derive = "1.0" serde_json = "1.0" [dev-dependencies] -ethcore = { path = "../ethcore", features = ["test-helpers"] } -ethkey = { path = "../ethkey" } +ethcore = { path = "../../ethcore", features = ["test-helpers"] } +ethkey = { path = "../../accounts/ethkey" } kvdb-memorydb = "0.1" diff --git a/local-store/src/lib.rs b/miner/local-store/src/lib.rs similarity index 100% rename from local-store/src/lib.rs rename to miner/local-store/src/lib.rs diff --git a/price-info/Cargo.toml b/miner/price-info/Cargo.toml similarity index 68% rename from price-info/Cargo.toml rename to miner/price-info/Cargo.toml index d1eef9e53..0b72fd37b 100644 --- a/price-info/Cargo.toml +++ b/miner/price-info/Cargo.toml @@ -7,12 +7,12 @@ version = "1.12.0" authors = ["Parity Technologies "] [dependencies] -fetch = { path = "../util/fetch" } +fetch = { path = "../../util/fetch" } futures = "0.1" -parity-runtime = { path = "../util/runtime" } +parity-runtime = { path = "../../util/runtime" } log = "0.4" serde_json = "1.0" [dev-dependencies] parking_lot = "0.7" -fake-fetch = { path = "../util/fake-fetch" } +fake-fetch = { path = "../../util/fake-fetch" } diff --git a/price-info/src/lib.rs b/miner/price-info/src/lib.rs similarity index 100% rename from price-info/src/lib.rs rename to miner/price-info/src/lib.rs diff --git a/ethcore/stratum/Cargo.toml b/miner/stratum/Cargo.toml similarity index 100% rename from ethcore/stratum/Cargo.toml rename to miner/stratum/Cargo.toml diff --git a/ethcore/stratum/src/lib.rs b/miner/stratum/src/lib.rs similarity index 100% rename from ethcore/stratum/src/lib.rs rename to miner/stratum/src/lib.rs diff --git a/ethcore/stratum/src/traits.rs b/miner/stratum/src/traits.rs similarity index 100% rename from ethcore/stratum/src/traits.rs rename to miner/stratum/src/traits.rs diff --git a/util/using_queue/Cargo.toml b/miner/using-queue/Cargo.toml similarity index 100% rename from util/using_queue/Cargo.toml rename to miner/using-queue/Cargo.toml diff --git a/util/using_queue/src/lib.rs b/miner/using-queue/src/lib.rs similarity index 100% rename from util/using_queue/src/lib.rs rename to miner/using-queue/src/lib.rs diff --git a/parity-clib/Cargo.toml b/parity-clib/Cargo.toml index e603ca2de..5397225ea 100644 --- a/parity-clib/Cargo.toml +++ b/parity-clib/Cargo.toml @@ -10,7 +10,7 @@ name = "parity" crate-type = ["cdylib", "staticlib"] [dependencies] -panic_hook = { path = "../util/panic_hook" } +panic_hook = { path = "../util/panic-hook" } parity-ethereum = { path = "../", default-features = false } jni = { version = "0.10.1", optional = true } diff --git a/parity-clib-examples/cpp/CMakeLists.txt b/parity-clib/examples/cpp/CMakeLists.txt similarity index 74% rename from parity-clib-examples/cpp/CMakeLists.txt rename to parity-clib/examples/cpp/CMakeLists.txt index ed6229061..69b58c211 100644 --- a/parity-clib-examples/cpp/CMakeLists.txt +++ b/parity-clib/examples/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) include(ExternalProject) -include_directories("${CMAKE_SOURCE_DIR}/../../parity-clib") +include_directories("${CMAKE_SOURCE_DIR}/../../../parity-clib") add_executable(parity-example main.cpp) @@ -11,9 +11,9 @@ ExternalProject_Add( CONFIGURE_COMMAND "" BUILD_COMMAND "" COMMAND cargo build -p parity-clib # Note: use --release in a real project - BINARY_DIR "${CMAKE_SOURCE_DIR}/../../target" + BINARY_DIR "${CMAKE_SOURCE_DIR}/../../../target" INSTALL_COMMAND "" LOG_BUILD ON) add_dependencies(parity-example libparity) -target_link_libraries(parity-example "${CMAKE_SOURCE_DIR}/../../target/debug/libparity.so") +target_link_libraries(parity-example "${CMAKE_SOURCE_DIR}/../../../target/debug/libparity.so") diff --git a/parity-clib-examples/cpp/main.cpp b/parity-clib/examples/cpp/main.cpp similarity index 100% rename from parity-clib-examples/cpp/main.cpp rename to parity-clib/examples/cpp/main.cpp diff --git a/parity/lib.rs b/parity/lib.rs index c885b43bb..b5a614a7b 100644 --- a/parity/lib.rs +++ b/parity/lib.rs @@ -42,6 +42,7 @@ extern crate serde_derive; extern crate toml; extern crate blooms_db; +extern crate cli_signer; extern crate ethcore; extern crate parity_bytes as bytes; extern crate ethcore_io as io; @@ -65,7 +66,6 @@ extern crate parity_updater as updater; extern crate parity_version; extern crate parity_whisper; extern crate parity_path as path; -extern crate rpc_cli; extern crate node_filter; extern crate keccak_hash as hash; extern crate journaldb; @@ -200,9 +200,9 @@ fn execute(command: Execute, on_client_rq: Cr, on_updater_rq: Rr) -> Res Cmd::ImportPresaleWallet(presale_cmd) => presale::execute(presale_cmd).map(|s| ExecutionAction::Instant(Some(s))), Cmd::Blockchain(blockchain_cmd) => blockchain::execute(blockchain_cmd).map(|_| ExecutionAction::Instant(None)), Cmd::SignerToken(ws_conf, logger_config) => signer::execute(ws_conf, logger_config).map(|s| ExecutionAction::Instant(Some(s))), - Cmd::SignerSign { id, pwfile, port, authfile } => rpc_cli::signer_sign(id, pwfile, port, authfile).map(|s| ExecutionAction::Instant(Some(s))), - Cmd::SignerList { port, authfile } => rpc_cli::signer_list(port, authfile).map(|s| ExecutionAction::Instant(Some(s))), - Cmd::SignerReject { id, port, authfile } => rpc_cli::signer_reject(id, port, authfile).map(|s| ExecutionAction::Instant(Some(s))), + Cmd::SignerSign { id, pwfile, port, authfile } => cli_signer::signer_sign(id, pwfile, port, authfile).map(|s| ExecutionAction::Instant(Some(s))), + Cmd::SignerList { port, authfile } => cli_signer::signer_list(port, authfile).map(|s| ExecutionAction::Instant(Some(s))), + Cmd::SignerReject { id, port, authfile } => cli_signer::signer_reject(id, port, authfile).map(|s| ExecutionAction::Instant(Some(s))), Cmd::Snapshot(snapshot_cmd) => snapshot::execute(snapshot_cmd).map(|s| ExecutionAction::Instant(Some(s))), Cmd::ExportHardcodedSync(export_hs_cmd) => export_hardcoded_sync::execute(export_hs_cmd).map(|s| ExecutionAction::Instant(Some(s))), } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index a315691bd..dc000d73b 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -36,10 +36,9 @@ jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = " ethash = { path = "../ethash" } ethcore = { path = "../ethcore", features = ["test-helpers"] } +fastmap = { path = "../util/fastmap" } parity-bytes = "0.1" parity-crypto = "0.2" -fastmap = { path = "../util/fastmap" } -ethcore-devtools = { path = "../devtools" } ethcore-io = { path = "../util/io" } ethcore-light = { path = "../ethcore/light" } ethcore-logger = { path = "../logger" } @@ -50,8 +49,8 @@ ethcore-transaction = { path = "../ethcore/transaction" } ethereum-types = "0.4" ethjson = { path = "../json" } -ethkey = { path = "../ethkey" } -ethstore = { path = "../ethstore" } +ethkey = { path = "../accounts/ethkey" } +ethstore = { path = "../accounts/ethstore" } fetch = { path = "../util/fetch" } keccak-hash = "0.1.2" parity-runtime = { path = "../util/runtime" } @@ -64,10 +63,10 @@ stats = { path = "../util/stats" } vm = { path = "../ethcore/vm" } [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] ethcore = { path = "../ethcore", features = ["test-helpers"] } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index b87515c62..4cacb9587 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -46,7 +46,6 @@ extern crate ethcore; extern crate fastmap; extern crate parity_bytes as bytes; extern crate parity_crypto as crypto; -extern crate ethcore_devtools as devtools; extern crate ethcore_io as io; extern crate ethcore_light as light; extern crate ethcore_logger; diff --git a/devtools/src/http_client.rs b/rpc/src/tests/http_client.rs similarity index 100% rename from devtools/src/http_client.rs rename to rpc/src/tests/http_client.rs diff --git a/rpc/src/tests/mod.rs b/rpc/src/tests/mod.rs index 6ecab3299..4d0a23dfc 100644 --- a/rpc/src/tests/mod.rs +++ b/rpc/src/tests/mod.rs @@ -17,5 +17,6 @@ //! RPC integration tests. mod helpers; +mod http_client; #[cfg(test)] mod rpc; pub mod ws; diff --git a/rpc/src/tests/rpc.rs b/rpc/src/tests/rpc.rs index 656811d67..e370efd15 100644 --- a/rpc/src/tests/rpc.rs +++ b/rpc/src/tests/rpc.rs @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use devtools::http_client; use jsonrpc_core::MetaIoHandler; use http::{self, hyper}; use {HttpServer}; use tests::helpers::Server; +use tests::http_client; use v1::{extractors, Metadata}; fn serve(handler: Option>) -> Server { diff --git a/rpc/src/tests/ws.rs b/rpc/src/tests/ws.rs index 067573562..847671624 100644 --- a/rpc/src/tests/ws.rs +++ b/rpc/src/tests/ws.rs @@ -18,12 +18,12 @@ use std::sync::Arc; -use devtools::http_client; use jsonrpc_core::MetaIoHandler; use ws; use v1::{extractors, informant}; use tests::helpers::{GuardedAuthCodes, Server}; +use tests::http_client; /// Setup a mock signer for tests pub fn serve() -> (Server, usize, GuardedAuthCodes) { @@ -56,8 +56,7 @@ pub fn request(server: Server, request: &str) -> http_client::Respon mod testing { use std::time; use hash::keccak; - use devtools::http_client; - use super::{serve, request}; + use super::{serve, request, http_client}; #[test] fn should_not_redirect_to_parity_host() { diff --git a/secret_store/Cargo.toml b/secret-store/Cargo.toml similarity index 96% rename from secret_store/Cargo.toml rename to secret-store/Cargo.toml index a5ba30726..f431b6fbd 100644 --- a/secret_store/Cargo.toml +++ b/secret-store/Cargo.toml @@ -30,7 +30,7 @@ ethcore-transaction = { path = "../ethcore/transaction" } ethereum-types = "0.4" kvdb = "0.1" keccak-hash = "0.1" -ethkey = { path = "../ethkey" } +ethkey = { path = "../accounts/ethkey" } lazy_static = "1.0" ethabi = "6.0" ethabi-derive = "6.0" diff --git a/secret_store/res/acl_storage.json b/secret-store/res/acl_storage.json similarity index 100% rename from secret_store/res/acl_storage.json rename to secret-store/res/acl_storage.json diff --git a/secret_store/res/key_server_set.json b/secret-store/res/key_server_set.json similarity index 100% rename from secret_store/res/key_server_set.json rename to secret-store/res/key_server_set.json diff --git a/secret_store/res/service.json b/secret-store/res/service.json similarity index 100% rename from secret_store/res/service.json rename to secret-store/res/service.json diff --git a/secret_store/src/acl_storage.rs b/secret-store/src/acl_storage.rs similarity index 100% rename from secret_store/src/acl_storage.rs rename to secret-store/src/acl_storage.rs diff --git a/secret_store/src/helpers.rs b/secret-store/src/helpers.rs similarity index 100% rename from secret_store/src/helpers.rs rename to secret-store/src/helpers.rs diff --git a/secret_store/src/key_server.rs b/secret-store/src/key_server.rs similarity index 100% rename from secret_store/src/key_server.rs rename to secret-store/src/key_server.rs diff --git a/secret_store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs b/secret-store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs rename to secret-store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs diff --git a/secret_store/src/key_server_cluster/admin_sessions/mod.rs b/secret-store/src/key_server_cluster/admin_sessions/mod.rs similarity index 100% rename from secret_store/src/key_server_cluster/admin_sessions/mod.rs rename to secret-store/src/key_server_cluster/admin_sessions/mod.rs diff --git a/secret_store/src/key_server_cluster/admin_sessions/servers_set_change_session.rs b/secret-store/src/key_server_cluster/admin_sessions/servers_set_change_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/admin_sessions/servers_set_change_session.rs rename to secret-store/src/key_server_cluster/admin_sessions/servers_set_change_session.rs diff --git a/secret_store/src/key_server_cluster/admin_sessions/sessions_queue.rs b/secret-store/src/key_server_cluster/admin_sessions/sessions_queue.rs similarity index 100% rename from secret_store/src/key_server_cluster/admin_sessions/sessions_queue.rs rename to secret-store/src/key_server_cluster/admin_sessions/sessions_queue.rs diff --git a/secret_store/src/key_server_cluster/admin_sessions/share_add_session.rs b/secret-store/src/key_server_cluster/admin_sessions/share_add_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/admin_sessions/share_add_session.rs rename to secret-store/src/key_server_cluster/admin_sessions/share_add_session.rs diff --git a/secret_store/src/key_server_cluster/admin_sessions/share_change_session.rs b/secret-store/src/key_server_cluster/admin_sessions/share_change_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/admin_sessions/share_change_session.rs rename to secret-store/src/key_server_cluster/admin_sessions/share_change_session.rs diff --git a/secret_store/src/key_server_cluster/client_sessions/decryption_session.rs b/secret-store/src/key_server_cluster/client_sessions/decryption_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/client_sessions/decryption_session.rs rename to secret-store/src/key_server_cluster/client_sessions/decryption_session.rs diff --git a/secret_store/src/key_server_cluster/client_sessions/encryption_session.rs b/secret-store/src/key_server_cluster/client_sessions/encryption_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/client_sessions/encryption_session.rs rename to secret-store/src/key_server_cluster/client_sessions/encryption_session.rs diff --git a/secret_store/src/key_server_cluster/client_sessions/generation_session.rs b/secret-store/src/key_server_cluster/client_sessions/generation_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/client_sessions/generation_session.rs rename to secret-store/src/key_server_cluster/client_sessions/generation_session.rs diff --git a/secret_store/src/key_server_cluster/client_sessions/mod.rs b/secret-store/src/key_server_cluster/client_sessions/mod.rs similarity index 100% rename from secret_store/src/key_server_cluster/client_sessions/mod.rs rename to secret-store/src/key_server_cluster/client_sessions/mod.rs diff --git a/secret_store/src/key_server_cluster/client_sessions/signing_session_ecdsa.rs b/secret-store/src/key_server_cluster/client_sessions/signing_session_ecdsa.rs similarity index 100% rename from secret_store/src/key_server_cluster/client_sessions/signing_session_ecdsa.rs rename to secret-store/src/key_server_cluster/client_sessions/signing_session_ecdsa.rs diff --git a/secret_store/src/key_server_cluster/client_sessions/signing_session_schnorr.rs b/secret-store/src/key_server_cluster/client_sessions/signing_session_schnorr.rs similarity index 100% rename from secret_store/src/key_server_cluster/client_sessions/signing_session_schnorr.rs rename to secret-store/src/key_server_cluster/client_sessions/signing_session_schnorr.rs diff --git a/secret_store/src/key_server_cluster/cluster.rs b/secret-store/src/key_server_cluster/cluster.rs similarity index 100% rename from secret_store/src/key_server_cluster/cluster.rs rename to secret-store/src/key_server_cluster/cluster.rs diff --git a/secret_store/src/key_server_cluster/cluster_sessions.rs b/secret-store/src/key_server_cluster/cluster_sessions.rs similarity index 100% rename from secret_store/src/key_server_cluster/cluster_sessions.rs rename to secret-store/src/key_server_cluster/cluster_sessions.rs diff --git a/secret_store/src/key_server_cluster/cluster_sessions_creator.rs b/secret-store/src/key_server_cluster/cluster_sessions_creator.rs similarity index 100% rename from secret_store/src/key_server_cluster/cluster_sessions_creator.rs rename to secret-store/src/key_server_cluster/cluster_sessions_creator.rs diff --git a/secret_store/src/key_server_cluster/connection_trigger.rs b/secret-store/src/key_server_cluster/connection_trigger.rs similarity index 100% rename from secret_store/src/key_server_cluster/connection_trigger.rs rename to secret-store/src/key_server_cluster/connection_trigger.rs diff --git a/secret_store/src/key_server_cluster/connection_trigger_with_migration.rs b/secret-store/src/key_server_cluster/connection_trigger_with_migration.rs similarity index 100% rename from secret_store/src/key_server_cluster/connection_trigger_with_migration.rs rename to secret-store/src/key_server_cluster/connection_trigger_with_migration.rs diff --git a/secret_store/src/key_server_cluster/io/deadline.rs b/secret-store/src/key_server_cluster/io/deadline.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/deadline.rs rename to secret-store/src/key_server_cluster/io/deadline.rs diff --git a/secret_store/src/key_server_cluster/io/handshake.rs b/secret-store/src/key_server_cluster/io/handshake.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/handshake.rs rename to secret-store/src/key_server_cluster/io/handshake.rs diff --git a/secret_store/src/key_server_cluster/io/message.rs b/secret-store/src/key_server_cluster/io/message.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/message.rs rename to secret-store/src/key_server_cluster/io/message.rs diff --git a/secret_store/src/key_server_cluster/io/mod.rs b/secret-store/src/key_server_cluster/io/mod.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/mod.rs rename to secret-store/src/key_server_cluster/io/mod.rs diff --git a/secret_store/src/key_server_cluster/io/read_header.rs b/secret-store/src/key_server_cluster/io/read_header.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/read_header.rs rename to secret-store/src/key_server_cluster/io/read_header.rs diff --git a/secret_store/src/key_server_cluster/io/read_message.rs b/secret-store/src/key_server_cluster/io/read_message.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/read_message.rs rename to secret-store/src/key_server_cluster/io/read_message.rs diff --git a/secret_store/src/key_server_cluster/io/read_payload.rs b/secret-store/src/key_server_cluster/io/read_payload.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/read_payload.rs rename to secret-store/src/key_server_cluster/io/read_payload.rs diff --git a/secret_store/src/key_server_cluster/io/shared_tcp_stream.rs b/secret-store/src/key_server_cluster/io/shared_tcp_stream.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/shared_tcp_stream.rs rename to secret-store/src/key_server_cluster/io/shared_tcp_stream.rs diff --git a/secret_store/src/key_server_cluster/io/write_message.rs b/secret-store/src/key_server_cluster/io/write_message.rs similarity index 100% rename from secret_store/src/key_server_cluster/io/write_message.rs rename to secret-store/src/key_server_cluster/io/write_message.rs diff --git a/secret_store/src/key_server_cluster/jobs/consensus_session.rs b/secret-store/src/key_server_cluster/jobs/consensus_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/consensus_session.rs rename to secret-store/src/key_server_cluster/jobs/consensus_session.rs diff --git a/secret_store/src/key_server_cluster/jobs/decryption_job.rs b/secret-store/src/key_server_cluster/jobs/decryption_job.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/decryption_job.rs rename to secret-store/src/key_server_cluster/jobs/decryption_job.rs diff --git a/secret_store/src/key_server_cluster/jobs/dummy_job.rs b/secret-store/src/key_server_cluster/jobs/dummy_job.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/dummy_job.rs rename to secret-store/src/key_server_cluster/jobs/dummy_job.rs diff --git a/secret_store/src/key_server_cluster/jobs/job_session.rs b/secret-store/src/key_server_cluster/jobs/job_session.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/job_session.rs rename to secret-store/src/key_server_cluster/jobs/job_session.rs diff --git a/secret_store/src/key_server_cluster/jobs/key_access_job.rs b/secret-store/src/key_server_cluster/jobs/key_access_job.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/key_access_job.rs rename to secret-store/src/key_server_cluster/jobs/key_access_job.rs diff --git a/secret_store/src/key_server_cluster/jobs/mod.rs b/secret-store/src/key_server_cluster/jobs/mod.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/mod.rs rename to secret-store/src/key_server_cluster/jobs/mod.rs diff --git a/secret_store/src/key_server_cluster/jobs/servers_set_change_access_job.rs b/secret-store/src/key_server_cluster/jobs/servers_set_change_access_job.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/servers_set_change_access_job.rs rename to secret-store/src/key_server_cluster/jobs/servers_set_change_access_job.rs diff --git a/secret_store/src/key_server_cluster/jobs/signing_job_ecdsa.rs b/secret-store/src/key_server_cluster/jobs/signing_job_ecdsa.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/signing_job_ecdsa.rs rename to secret-store/src/key_server_cluster/jobs/signing_job_ecdsa.rs diff --git a/secret_store/src/key_server_cluster/jobs/signing_job_schnorr.rs b/secret-store/src/key_server_cluster/jobs/signing_job_schnorr.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/signing_job_schnorr.rs rename to secret-store/src/key_server_cluster/jobs/signing_job_schnorr.rs diff --git a/secret_store/src/key_server_cluster/jobs/unknown_sessions_job.rs b/secret-store/src/key_server_cluster/jobs/unknown_sessions_job.rs similarity index 100% rename from secret_store/src/key_server_cluster/jobs/unknown_sessions_job.rs rename to secret-store/src/key_server_cluster/jobs/unknown_sessions_job.rs diff --git a/secret_store/src/key_server_cluster/math.rs b/secret-store/src/key_server_cluster/math.rs similarity index 100% rename from secret_store/src/key_server_cluster/math.rs rename to secret-store/src/key_server_cluster/math.rs diff --git a/secret_store/src/key_server_cluster/message.rs b/secret-store/src/key_server_cluster/message.rs similarity index 100% rename from secret_store/src/key_server_cluster/message.rs rename to secret-store/src/key_server_cluster/message.rs diff --git a/secret_store/src/key_server_cluster/mod.rs b/secret-store/src/key_server_cluster/mod.rs similarity index 100% rename from secret_store/src/key_server_cluster/mod.rs rename to secret-store/src/key_server_cluster/mod.rs diff --git a/secret_store/src/key_server_cluster/net/accept_connection.rs b/secret-store/src/key_server_cluster/net/accept_connection.rs similarity index 100% rename from secret_store/src/key_server_cluster/net/accept_connection.rs rename to secret-store/src/key_server_cluster/net/accept_connection.rs diff --git a/secret_store/src/key_server_cluster/net/connect.rs b/secret-store/src/key_server_cluster/net/connect.rs similarity index 100% rename from secret_store/src/key_server_cluster/net/connect.rs rename to secret-store/src/key_server_cluster/net/connect.rs diff --git a/secret_store/src/key_server_cluster/net/connection.rs b/secret-store/src/key_server_cluster/net/connection.rs similarity index 100% rename from secret_store/src/key_server_cluster/net/connection.rs rename to secret-store/src/key_server_cluster/net/connection.rs diff --git a/secret_store/src/key_server_cluster/net/mod.rs b/secret-store/src/key_server_cluster/net/mod.rs similarity index 100% rename from secret_store/src/key_server_cluster/net/mod.rs rename to secret-store/src/key_server_cluster/net/mod.rs diff --git a/secret_store/src/key_server_set.rs b/secret-store/src/key_server_set.rs similarity index 100% rename from secret_store/src/key_server_set.rs rename to secret-store/src/key_server_set.rs diff --git a/secret_store/src/key_storage.rs b/secret-store/src/key_storage.rs similarity index 100% rename from secret_store/src/key_storage.rs rename to secret-store/src/key_storage.rs diff --git a/secret_store/src/lib.rs b/secret-store/src/lib.rs similarity index 100% rename from secret_store/src/lib.rs rename to secret-store/src/lib.rs diff --git a/secret_store/src/listener/http_listener.rs b/secret-store/src/listener/http_listener.rs similarity index 100% rename from secret_store/src/listener/http_listener.rs rename to secret-store/src/listener/http_listener.rs diff --git a/secret_store/src/listener/mod.rs b/secret-store/src/listener/mod.rs similarity index 100% rename from secret_store/src/listener/mod.rs rename to secret-store/src/listener/mod.rs diff --git a/secret_store/src/listener/service_contract.rs b/secret-store/src/listener/service_contract.rs similarity index 100% rename from secret_store/src/listener/service_contract.rs rename to secret-store/src/listener/service_contract.rs diff --git a/secret_store/src/listener/service_contract_aggregate.rs b/secret-store/src/listener/service_contract_aggregate.rs similarity index 100% rename from secret_store/src/listener/service_contract_aggregate.rs rename to secret-store/src/listener/service_contract_aggregate.rs diff --git a/secret_store/src/listener/service_contract_listener.rs b/secret-store/src/listener/service_contract_listener.rs similarity index 100% rename from secret_store/src/listener/service_contract_listener.rs rename to secret-store/src/listener/service_contract_listener.rs diff --git a/secret_store/src/listener/tasks_queue.rs b/secret-store/src/listener/tasks_queue.rs similarity index 100% rename from secret_store/src/listener/tasks_queue.rs rename to secret-store/src/listener/tasks_queue.rs diff --git a/secret_store/src/node_key_pair.rs b/secret-store/src/node_key_pair.rs similarity index 100% rename from secret_store/src/node_key_pair.rs rename to secret-store/src/node_key_pair.rs diff --git a/secret_store/src/serialization.rs b/secret-store/src/serialization.rs similarity index 100% rename from secret_store/src/serialization.rs rename to secret-store/src/serialization.rs diff --git a/secret_store/src/traits.rs b/secret-store/src/traits.rs similarity index 100% rename from secret_store/src/traits.rs rename to secret-store/src/traits.rs diff --git a/secret_store/src/trusted_client.rs b/secret-store/src/trusted_client.rs similarity index 100% rename from secret_store/src/trusted_client.rs rename to secret-store/src/trusted_client.rs diff --git a/secret_store/src/types/all.rs b/secret-store/src/types/all.rs similarity index 100% rename from secret_store/src/types/all.rs rename to secret-store/src/types/all.rs diff --git a/secret_store/src/types/error.rs b/secret-store/src/types/error.rs similarity index 100% rename from secret_store/src/types/error.rs rename to secret-store/src/types/error.rs diff --git a/secret_store/src/types/mod.rs b/secret-store/src/types/mod.rs similarity index 100% rename from secret_store/src/types/mod.rs rename to secret-store/src/types/mod.rs diff --git a/test.sh b/test.sh index 762f20972..75c932efc 100755 --- a/test.sh +++ b/test.sh @@ -59,15 +59,14 @@ cpp_test () { (x86_64-unknown-linux-gnu) # Running the C++ example echo "________Running the C++ example________" - cd parity-clib-examples/cpp && \ - mkdir -p build && \ - cd build && \ - cmake .. && \ - make -j $THREADS && \ - ./parity-example && \ - cd .. && \ - rm -rf build && \ - cd ../.. + DIR=parity-clib/examples/cpp/build + mkdir -p $DIR + cd $DIR + cmake .. + make -j $THREADS + ./parity-example + cd - + rm -rf $DIR ;; (*) echo "________Skipping the C++ example________" diff --git a/updater/Cargo.toml b/updater/Cargo.toml index 2a0683a09..329a150e9 100644 --- a/updater/Cargo.toml +++ b/updater/Cargo.toml @@ -19,7 +19,7 @@ parity-bytes = "0.1" ethcore-sync = { path = "../ethcore/sync" } ethereum-types = "0.4" parking_lot = "0.7" -parity-hash-fetch = { path = "../hash-fetch" } +parity-hash-fetch = { path = "hash-fetch" } parity-version = { path = "../util/version" } parity-path = "0.1" rand = "0.4" diff --git a/hash-fetch/Cargo.toml b/updater/hash-fetch/Cargo.toml similarity index 73% rename from hash-fetch/Cargo.toml rename to updater/hash-fetch/Cargo.toml index 975f00a89..1c5477c06 100644 --- a/hash-fetch/Cargo.toml +++ b/updater/hash-fetch/Cargo.toml @@ -13,12 +13,12 @@ mime = "0.3" mime_guess = "2.0.0-alpha.2" rand = "0.4" rustc-hex = "1.0" -fetch = { path = "../util/fetch" } +fetch = { path = "../../util/fetch" } parity-bytes = "0.1" ethereum-types = "0.4" -parity-runtime = { path = "../util/runtime" } +parity-runtime = { path = "../../util/runtime" } keccak-hash = "0.1" -registrar = { path = "../registrar" } +registrar = { path = "../../util/registrar" } ethabi = "6.0" ethabi-derive = "6.0" @@ -26,4 +26,4 @@ ethabi-contract = "6.0" [dev-dependencies] parking_lot = "0.7" -fake-fetch = { path = "../util/fake-fetch" } +fake-fetch = { path = "../../util/fake-fetch" } diff --git a/hash-fetch/res/urlhint.json b/updater/hash-fetch/res/urlhint.json similarity index 100% rename from hash-fetch/res/urlhint.json rename to updater/hash-fetch/res/urlhint.json diff --git a/hash-fetch/src/client.rs b/updater/hash-fetch/src/client.rs similarity index 100% rename from hash-fetch/src/client.rs rename to updater/hash-fetch/src/client.rs diff --git a/hash-fetch/src/lib.rs b/updater/hash-fetch/src/lib.rs similarity index 100% rename from hash-fetch/src/lib.rs rename to updater/hash-fetch/src/lib.rs diff --git a/hash-fetch/src/urlhint.rs b/updater/hash-fetch/src/urlhint.rs similarity index 100% rename from hash-fetch/src/urlhint.rs rename to updater/hash-fetch/src/urlhint.rs diff --git a/util/len-caching-mutex/Cargo.toml b/util/len-caching-mutex/Cargo.toml deleted file mode 100644 index a1cfde1f0..000000000 --- a/util/len-caching-mutex/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -description = "Mutex with cached len, for use with collections" -homepage = "http://parity.io" -license = "GPL-3.0" -name = "len-caching-mutex" -version = "0.1.0" -authors = ["Parity Technologies "] - -[dependencies] -parking_lot = "0.7" diff --git a/util/memory_cache/Cargo.toml b/util/memory-cache/Cargo.toml similarity index 100% rename from util/memory_cache/Cargo.toml rename to util/memory-cache/Cargo.toml diff --git a/util/memory_cache/src/lib.rs b/util/memory-cache/src/lib.rs similarity index 100% rename from util/memory_cache/src/lib.rs rename to util/memory-cache/src/lib.rs diff --git a/util/mem/Cargo.toml b/util/memzero/Cargo.toml similarity index 82% rename from util/mem/Cargo.toml rename to util/memzero/Cargo.toml index 29d1db923..4b62e7adc 100644 --- a/util/mem/Cargo.toml +++ b/util/memzero/Cargo.toml @@ -1,4 +1,4 @@ [package] -name = "mem" +name = "memzero" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/util/mem/src/lib.rs b/util/memzero/src/lib.rs similarity index 100% rename from util/mem/src/lib.rs rename to util/memzero/src/lib.rs diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml index 87d36b718..aa54e030a 100644 --- a/util/network-devp2p/Cargo.toml +++ b/util/network-devp2p/Cargo.toml @@ -25,7 +25,7 @@ parity-crypto = "0.2" ethcore-logger = { path ="../../logger" } ethcore-network = { path = "../network" } ethereum-types = "0.4" -ethkey = { path = "../../ethkey" } +ethkey = { path = "../../accounts/ethkey" } rlp = { version = "0.3.0", features = ["ethereum"] } parity-path = "0.1" ipnetwork = "0.12.6" diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml index ef2e11d12..b24249cd5 100644 --- a/util/network/Cargo.toml +++ b/util/network/Cargo.toml @@ -11,7 +11,7 @@ error-chain = { version = "0.12", default-features = false } parity-crypto = "0.2" ethcore-io = { path = "../io" } ethereum-types = "0.4" -ethkey = { path = "../../ethkey" } +ethkey = { path = "../../accounts/ethkey" } ipnetwork = "0.12.6" rlp = { version = "0.3.0", features = ["ethereum"] } libc = "0.2" diff --git a/util/panic_hook/Cargo.toml b/util/panic-hook/Cargo.toml similarity index 100% rename from util/panic_hook/Cargo.toml rename to util/panic-hook/Cargo.toml diff --git a/util/panic_hook/src/lib.rs b/util/panic-hook/src/lib.rs similarity index 100% rename from util/panic_hook/src/lib.rs rename to util/panic-hook/src/lib.rs diff --git a/registrar/Cargo.toml b/util/registrar/Cargo.toml similarity index 100% rename from registrar/Cargo.toml rename to util/registrar/Cargo.toml diff --git a/registrar/res/registrar.json b/util/registrar/res/registrar.json similarity index 100% rename from registrar/res/registrar.json rename to util/registrar/res/registrar.json diff --git a/registrar/src/lib.rs b/util/registrar/src/lib.rs similarity index 100% rename from registrar/src/lib.rs rename to util/registrar/src/lib.rs diff --git a/registrar/src/registrar.rs b/util/registrar/src/registrar.rs similarity index 100% rename from registrar/src/registrar.rs rename to util/registrar/src/registrar.rs diff --git a/util/rlp_compress/Cargo.toml b/util/rlp-compress/Cargo.toml similarity index 100% rename from util/rlp_compress/Cargo.toml rename to util/rlp-compress/Cargo.toml diff --git a/util/rlp_compress/src/common.rs b/util/rlp-compress/src/common.rs similarity index 100% rename from util/rlp_compress/src/common.rs rename to util/rlp-compress/src/common.rs diff --git a/util/rlp_compress/src/lib.rs b/util/rlp-compress/src/lib.rs similarity index 100% rename from util/rlp_compress/src/lib.rs rename to util/rlp-compress/src/lib.rs diff --git a/util/rlp_compress/tests/compress.rs b/util/rlp-compress/tests/compress.rs similarity index 100% rename from util/rlp_compress/tests/compress.rs rename to util/rlp-compress/tests/compress.rs diff --git a/util/rlp_derive/Cargo.toml b/util/rlp-derive/Cargo.toml similarity index 100% rename from util/rlp_derive/Cargo.toml rename to util/rlp-derive/Cargo.toml diff --git a/util/rlp_derive/src/de.rs b/util/rlp-derive/src/de.rs similarity index 100% rename from util/rlp_derive/src/de.rs rename to util/rlp-derive/src/de.rs diff --git a/util/rlp_derive/src/en.rs b/util/rlp-derive/src/en.rs similarity index 100% rename from util/rlp_derive/src/en.rs rename to util/rlp-derive/src/en.rs diff --git a/util/rlp_derive/src/lib.rs b/util/rlp-derive/src/lib.rs similarity index 100% rename from util/rlp_derive/src/lib.rs rename to util/rlp-derive/src/lib.rs diff --git a/util/rlp_derive/tests/rlp.rs b/util/rlp-derive/tests/rlp.rs similarity index 100% rename from util/rlp_derive/tests/rlp.rs rename to util/rlp-derive/tests/rlp.rs diff --git a/util/stop-guard/Cargo.toml b/util/stop-guard/Cargo.toml deleted file mode 100644 index f8fa5f123..000000000 --- a/util/stop-guard/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[package] -name = "stop-guard" -version = "0.1.0" -authors = ["Parity Technologies "] diff --git a/whisper/Cargo.toml b/whisper/Cargo.toml index 4c2f42576..fec601586 100644 --- a/whisper/Cargo.toml +++ b/whisper/Cargo.toml @@ -10,10 +10,10 @@ byteorder = "1.0.0" ethereum-types = "0.4" ethcore-network = { path = "../util/network" } parity-crypto = "0.2" -ethkey = { path = "../ethkey" } +ethkey = { path = "../accounts/ethkey" } hex = "0.2" log = "0.4" -mem = { path = "../util/mem" } +memzero = { path = "../util/memzero" } ordered-float = "0.5" parking_lot = "0.7" rand = "0.4" diff --git a/whisper/cli/Cargo.toml b/whisper/cli/Cargo.toml index b3e7fa7b1..243af28ee 100644 --- a/whisper/cli/Cargo.toml +++ b/whisper/cli/Cargo.toml @@ -13,7 +13,7 @@ parity-whisper = { path = "../" } docopt = "1.0" serde = "1.0" serde_derive = "1.0" -panic_hook = { path = "../../util/panic_hook" } +panic_hook = { path = "../../util/panic-hook" } jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" } jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" } jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" } diff --git a/whisper/src/lib.rs b/whisper/src/lib.rs index 66d8d1b73..175fa8033 100644 --- a/whisper/src/lib.rs +++ b/whisper/src/lib.rs @@ -23,7 +23,7 @@ extern crate ethcore_network as network; extern crate ethereum_types; extern crate ethkey; extern crate hex; -extern crate mem; +extern crate memzero; extern crate ordered_float; extern crate parking_lot; extern crate rand; diff --git a/whisper/src/rpc/crypto.rs b/whisper/src/rpc/crypto.rs index a796a0613..6daafc378 100644 --- a/whisper/src/rpc/crypto.rs +++ b/whisper/src/rpc/crypto.rs @@ -20,7 +20,7 @@ use crypto::aes_gcm::{Encryptor, Decryptor}; use ethkey::crypto::ecies; use ethereum_types::H256; use ethkey::{self, Public, Secret}; -use mem::Memzero; +use memzero::Memzero; /// Length of AES key pub const AES_KEY_LEN: usize = 32; diff --git a/whisper/src/rpc/key_store.rs b/whisper/src/rpc/key_store.rs index a63ef8652..61c06c6e4 100644 --- a/whisper/src/rpc/key_store.rs +++ b/whisper/src/rpc/key_store.rs @@ -23,7 +23,7 @@ use std::collections::HashMap; use ethereum_types::H256; use ethkey::{KeyPair, Public, Secret}; -use mem::Memzero; +use memzero::Memzero; use rand::{Rng, OsRng}; use rpc::crypto::{AES_KEY_LEN, EncryptionInstance, DecryptionInstance}; diff --git a/whisper/src/rpc/mod.rs b/whisper/src/rpc/mod.rs index 7406d6421..4c5e7316d 100644 --- a/whisper/src/rpc/mod.rs +++ b/whisper/src/rpc/mod.rs @@ -28,7 +28,7 @@ use jsonrpc_pubsub::{Session, PubSubMetadata, SubscriptionId}; use jsonrpc_macros::pubsub; use ethereum_types::H256; -use mem::Memzero; +use memzero::Memzero; use parking_lot::RwLock; use self::filter::Filter;