Changes necessary to upload crates to crates.io

Cargo.toml

@@ -58,7 +58,7 @@ parity-updater = { path = "updater" }
 parity-whisper = { path = "whisper" }
 path = { path = "util/path" }
 panic_hook = { path = "panic_hook" }
-hash = { path = "util/hash" }
+keccak-hash = { path = "util/hash" }
 migration = { path = "util/migration" }
 kvdb = { path = "util/kvdb" }
 kvdb-rocksdb = { path = "util/kvdb-rocksdb" }

dapps/Cargo.toml

@@ -36,7 +36,7 @@ node-health = { path = "./node-health" }
 parity-hash-fetch = { path = "../hash-fetch" }
 parity-reactor = { path = "../util/reactor" }
 parity-ui = { path = "./ui" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 
 clippy = { version = "0.0.103", optional = true}
 

dapps/src/lib.rs

@@ -42,7 +42,7 @@ extern crate node_health;
 extern crate parity_dapps_glue as parity_dapps;
 extern crate parity_hash_fetch as hash_fetch;
 extern crate parity_ui;
-extern crate hash;
+extern crate keccak_hash as hash;
 
 #[macro_use]
 extern crate futures;

ethash/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 primal = "0.2.3"
 parking_lot = "0.4"
 crunchy = "0.1.0"

ethash/src/keccak.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate hash;
+extern crate keccak_hash as hash;
 
 pub type H256 = [u8; 32];
 

ethcore/Cargo.toml

@@ -19,7 +19,7 @@ ethcore-bloom-journal = { path = "../util/bloom" }
 ethcore-bytes = { path = "../util/bytes" }
 hashdb = { path = "../util/hashdb" }
 memorydb = { path = "../util/memorydb" }
-patricia_trie = { path = "../util/patricia_trie" }
+patricia-trie = { path = "../util/patricia_trie" }
 ethcore-devtools = { path = "../devtools" }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
@@ -67,7 +67,7 @@ table = { path = "../util/table" }
 bloomable = { path = "../util/bloomable" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 triehash = { path = "../util/triehash" }
 semantic_version = { path = "../util/semantic_version" }
 unexpected = { path = "../util/unexpected" }

ethcore/evm/Cargo.toml

@@ -12,7 +12,7 @@ heapsize = "0.4"
 lazy_static = "0.2"
 log = "0.3"
 vm = { path = "../vm" }
-hash = { path = "../../util/hash" }
+keccak-hash = { path = "../../util/hash" }
 parking_lot = "0.4"
 memory-cache = { path = "../../util/memory_cache" }
 

ethcore/evm/src/lib.rs

@@ -22,7 +22,7 @@ extern crate ethcore_bigint as bigint;
 extern crate parking_lot;
 extern crate heapsize;
 extern crate vm;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate memory_cache;
 
 #[macro_use]

ethcore/light/Cargo.toml

@@ -13,7 +13,7 @@ ethcore-util = { path = "../../util" }
 ethcore-bigint = { path = "../../util/bigint" }
 ethcore-bytes = { path = "../../util/bytes" }
 memorydb = { path = "../../util/memorydb" }
-patricia_trie = { path = "../../util/patricia_trie" }
+patricia-trie = { path = "../../util/patricia_trie" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
 evm = { path = "../evm" }
@@ -31,7 +31,7 @@ serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.4"
 stats = { path = "../../util/stats" }
-hash = { path = "../../util/hash" }
+keccak-hash = { path = "../../util/hash" }
 triehash = { path = "../../util/triehash" }
 kvdb = { path = "../../util/kvdb" }
 kvdb-rocksdb = { path = "../../util/kvdb-rocksdb" }

ethcore/light/src/lib.rs

@@ -76,7 +76,7 @@ extern crate smallvec;
 extern crate stats;
 extern crate time;
 extern crate vm;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate triehash;
 extern crate kvdb;
 extern crate kvdb_memorydb;

ethcore/src/lib.rs

@@ -103,7 +103,7 @@ extern crate price_info;
 extern crate rand;
 extern crate rayon;
 extern crate rlp;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate heapsize;
 extern crate memorydb;
 extern crate patricia_trie as trie;

ethcore/types/Cargo.toml

@@ -12,7 +12,7 @@ ethcore-util = { path = "../../util" }
 ethcore-bigint = { path = "../../util/bigint" }
 ethjson = { path = "../../json" }
 bloomable = { path = "../../util/bloomable" }
-hash = { path = "../../util/hash" }
+keccak-hash = { path = "../../util/hash" }
 heapsize = "0.4"
 
 [dev-dependencies]

ethcore/types/src/lib.rs

@@ -24,7 +24,7 @@ extern crate rlp;
 #[macro_use]
 extern crate rlp_derive;
 extern crate bloomable;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate heapsize;
 
 #[cfg(test)]

ethcore/vm/Cargo.toml

@@ -8,9 +8,9 @@ byteorder = "1.0"
 ethcore-util = { path = "../../util" }
 ethcore-bytes = { path = "../../util/bytes" }
 ethcore-bigint = { path = "../../util/bigint" }
-patricia_trie = { path = "../../util/patricia_trie" }
+patricia-trie = { path = "../../util/patricia_trie" }
 log = "0.3"
 common-types = { path = "../types" }
 ethjson = { path = "../../json" }
 rlp = { path = "../../util/rlp" }
-hash = { path = "../../util/hash" }
+keccak-hash = { path = "../../util/hash" }

ethcore/vm/src/lib.rs

@@ -22,7 +22,7 @@ extern crate ethcore_bytes as bytes;
 extern crate common_types as types;
 extern crate ethjson;
 extern crate rlp;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate patricia_trie as trie;
 
 mod action_params;

hash-fetch/Cargo.toml

@@ -19,7 +19,7 @@ ethcore-bigint = { path = "../util/bigint" }
 ethcore-bytes = { path = "../util/bytes" }
 parity-reactor = { path = "../util/reactor" }
 native-contracts = { path = "../ethcore/native_contracts" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 
 [dev-dependencies]
 ethabi = "4.0"

hash-fetch/src/lib.rs

@@ -25,7 +25,7 @@ extern crate ethcore_util as util;
 extern crate ethcore_bigint as bigint;
 extern crate ethcore_bytes as bytes;
 extern crate futures;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate mime;
 extern crate mime_guess;
 extern crate native_contracts;

logger/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-description = "Ethcore client."
+description = "Log implementation for Parity"
 name = "ethcore-logger"
 version = "1.9.0"
 license = "GPL-3.0"

parity/main.rs

@@ -75,7 +75,7 @@ extern crate parity_whisper;
 extern crate path;
 extern crate rpc_cli;
 extern crate node_filter;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate journaldb;
 
 #[macro_use]

rpc/Cargo.toml

@@ -57,7 +57,7 @@ parity-updater = { path = "../updater" }
 rlp = { path = "../util/rlp" }
 stats = { path = "../util/stats" }
 vm = { path = "../ethcore/vm" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 hardware-wallet = { path = "../hw" }
 
 clippy = { version = "0.0.103", optional = true}

rpc/src/lib.rs

@@ -66,7 +66,7 @@ extern crate parity_reactor;
 extern crate parity_updater as updater;
 extern crate rlp;
 extern crate stats;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate hardware_wallet;
 
 #[macro_use]

rpc_client/Cargo.toml

@@ -17,4 +17,4 @@ parking_lot = "0.4"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 parity-rpc = { path = "../rpc" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }

rpc_client/src/lib.rs

@@ -9,7 +9,7 @@ extern crate parking_lot;
 extern crate serde;
 extern crate serde_json;
 extern crate url;
-extern crate hash;
+extern crate keccak_hash as hash;
 
 #[macro_use]
 extern crate log;

secret_store/Cargo.toml

@@ -28,7 +28,7 @@ ethcore-util = { path = "../util" }
 ethcore-bigint = { path = "../util/bigint" }
 kvdb = { path = "../util/kvdb" }
 kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 ethcore-logger = { path = "../logger" }
 ethcrypto = { path = "../ethcrypto" }
 ethkey = { path = "../ethkey" }

secret_store/src/lib.rs

@@ -44,7 +44,7 @@ extern crate ethcore_logger as logger;
 extern crate ethcrypto;
 extern crate ethkey;
 extern crate native_contracts;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate kvdb;
 extern crate kvdb_rocksdb;
 

stratum/Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ethcore-bigint = { path = "../util/bigint" }
 ethcore-logger = { path = "../logger" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
@@ -19,3 +19,5 @@ parking_lot = "0.4"
 env_logger = "0.4"
 tokio-core = "0.1"
 tokio-io = "0.1"
+parking_lot = "0.4"
+ethcore-logger = { path = "../logger" }

stratum/src/lib.rs

@@ -19,11 +19,12 @@
 extern crate jsonrpc_tcp_server;
 extern crate jsonrpc_core;
 extern crate jsonrpc_macros;
-#[macro_use] extern crate log;
 extern crate ethcore_bigint as bigint;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate parking_lot;
 
+#[macro_use] extern crate log;
+
 #[cfg(test)] extern crate tokio_core;
 #[cfg(test)] extern crate tokio_io;
 #[cfg(test)] extern crate ethcore_logger;

sync/Cargo.toml

@@ -16,7 +16,7 @@ ethcore-io = { path = "../util/io" }
 ethcore-light = { path = "../ethcore/light"}
 ethcore = { path = "../ethcore" }
 rlp = { path = "../util/rlp" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 triehash = { path = "../util/triehash" }
 kvdb = { path = "../util/kvdb" }
 macros = { path = "../util/macros" }

sync/src/lib.rs

@@ -40,7 +40,7 @@ extern crate parking_lot;
 extern crate smallvec;
 extern crate rlp;
 extern crate ipnetwork;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate triehash;
 extern crate kvdb;
 

util/Cargo.toml

@@ -16,7 +16,7 @@ eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
 elastic-array = "0.9"
 rlp = { path = "rlp" }
 heapsize = "0.4"
-hash = { path = "hash" }
+keccak-hash = { path = "hash" }
 clippy = { version = "0.0.103", optional = true}
 libc = "0.2.7"
 target_info = "0.1"
@@ -26,7 +26,7 @@ tiny-keccak= "1.0"
 ethcore-logger = { path = "../logger" }
 triehash = { path = "triehash" }
 hashdb = { path = "hashdb" }
-patricia_trie = { path = "patricia_trie" }
+patricia-trie = { path = "patricia_trie" }
 ethcore-bytes = { path = "bytes" }
 memorydb = { path = "memorydb" }
 util-error = { path = "error" }

util/bloomable/Cargo.toml

@@ -7,4 +7,4 @@ authors = ["debris <marek.kotewicz@gmail.com>"]
 ethcore-bigint = { path = "../bigint" }
 
 [dev-dependencies]
-hash = { path = "../hash" }
+keccak-hash = { path = "../hash" }

util/bloomable/tests/test.rs

@@ -1,4 +1,4 @@
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate ethcore_bigint;
 extern crate bloomable;
 

util/bytes/Cargo.toml

@@ -2,5 +2,7 @@
 name = "ethcore-bytes"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+description = "byte utilities for Parity"
+license = "GPL-3.0"
 
 [dependencies]

util/hash/Cargo.toml

@@ -2,13 +2,13 @@
 description = "Rust bindings for tinykeccak C library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
-name = "hash"
+name = "keccak-hash"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [dependencies]
-ethcore-bigint = { path = "../bigint" }
+ethcore-bigint = { version = "0.2.1", path = "../bigint" }
 tiny-keccak = "1.3"
 
 [build-dependencies]

util/hashdb/Cargo.toml

@@ -1,8 +1,10 @@
 [package]
 name = "hashdb"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]
+description = "trait for hash-keyed databases."
+license = "GPL-3.0"
 
 [dependencies]
 elastic-array = "0.9"
-ethcore-bigint = { path = "../bigint" }
+ethcore-bigint = { version = "0.2.1", path = "../bigint" }

util/journaldb/Cargo.toml

@@ -19,5 +19,5 @@ util-error = { path = "../error" }
 
 [dev-dependencies]
 ethcore-logger = { path = "../../logger" }
-hash = { path = "../hash" }
+keccak-hash = { path = "../hash" }
 kvdb-memorydb = { path = "../kvdb-memorydb" }

util/journaldb/src/lib.rs

@@ -32,7 +32,7 @@ extern crate util_error as error;
 #[cfg(test)]
 extern crate ethcore_logger;
 #[cfg(test)]
-extern crate hash as keccak;
+extern crate keccak_hash as keccak;
 #[cfg(test)]
 extern crate kvdb_memorydb;
 

util/memorydb/Cargo.toml

@@ -1,13 +1,15 @@
 [package]
 name = "memorydb"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]
+description = "in-memory implementation of hashdb"
+license = "GPL-3.0"
 
 [dependencies]
 bigint = "4.0"
 elastic-array = "0.9"
 heapsize = "0.4"
-ethcore-bigint = { path = "../bigint", features = ["heapsizeof"] }
-hash = { path = "../hash" }
-hashdb = { path = "../hashdb" }
-rlp = { path = "../rlp" }
+ethcore-bigint = { version = "0.2", path = "../bigint", features = ["heapsizeof"] }
+keccak-hash = { version = "0.1.0", path = "../hash" }
+hashdb = { version = "0.1.1", path = "../hashdb" }
+rlp = { version = "0.2.1", path = "../rlp" }