rename hash crate to keccak-hash

Cargo.lock

@@ -168,7 +168,7 @@ name = "bloomable"
 version = "0.1.0"
 dependencies = [
  "ethcore-bigint 0.2.1",
- "hash 0.1.0",
+ "keccak-hash 0.1.0",
 ]
 
 [[package]]
@@ -284,8 +284,8 @@ dependencies = [
  "ethcore-bytes 0.1.0",
  "ethcore-util 1.9.0",
  "ethjson 0.1.0",
- "hash 0.1.0",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "rlp 0.2.0",
  "rlp_derive 0.1.0",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -459,7 +459,7 @@ version = "1.9.0"
 dependencies = [
  "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.1.0",
+ "keccak-hash 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "memmap 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -493,12 +493,12 @@ dependencies = [
  "evm 0.1.0",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "hardware-wallet 1.9.0",
- "hash 0.1.0",
  "hashdb 0.1.1",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
  "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "journaldb 0.1.0",
+ "keccak-hash 0.1.0",
  "kvdb 0.1.0",
  "kvdb-memorydb 0.1.0",
  "kvdb-rocksdb 0.1.0",
@@ -592,9 +592,9 @@ dependencies = [
  "ethcore-util 1.9.0",
  "evm 0.1.0",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.1.0",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "kvdb 0.1.0",
  "kvdb-memorydb 0.1.0",
  "kvdb-rocksdb 0.1.0",
@@ -645,9 +645,9 @@ dependencies = [
  "ethcore-util 1.9.0",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
- "hash 0.1.0",
  "igd 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -680,8 +680,8 @@ dependencies = [
  "ethkey 0.2.0",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.1.0",
  "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "kvdb 0.1.0",
  "kvdb-rocksdb 0.1.0",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -709,10 +709,10 @@ dependencies = [
  "ethcore-devtools 1.9.0",
  "ethcore-logger 1.9.0",
  "ethcore-util 1.9.0",
- "hash 0.1.0",
  "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
  "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
  "jsonrpc-tcp-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
+ "keccak-hash 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -730,10 +730,10 @@ dependencies = [
  "ethcore-bigint 0.2.1",
  "ethcore-bytes 0.1.0",
  "ethcore-logger 1.9.0",
- "hash 0.1.0",
  "hashdb 0.1.1",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "journaldb 0.1.0",
+ "keccak-hash 0.1.0",
  "kvdb 0.1.0",
  "kvdb-memorydb 0.1.0",
  "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -853,9 +853,9 @@ dependencies = [
  "ethcore-network 1.9.0",
  "ethcore-util 1.9.0",
  "ethkey 0.2.0",
- "hash 0.1.0",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "kvdb 0.1.0",
  "kvdb-memorydb 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -877,8 +877,8 @@ dependencies = [
  "ethcore-bigint 0.2.1",
  "ethcore-util 1.9.0",
  "evmjit 1.9.0",
- "hash 0.1.0",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-cache 0.1.0",
@@ -1025,16 +1025,6 @@ dependencies = [
  "trezor-sys 1.0.0 (git+https://github.com/paritytech/trezor-sys)",
 ]
 
-[[package]]
-name = "hash"
-version = "0.1.0"
-dependencies = [
- "cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-bigint 0.2.1",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "hashdb"
 version = "0.1.1"
@@ -1222,9 +1212,9 @@ dependencies = [
  "ethcore-bigint 0.2.1",
  "ethcore-bytes 0.1.0",
  "ethcore-logger 1.9.0",
- "hash 0.1.0",
  "hashdb 0.1.1",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "kvdb 0.1.0",
  "kvdb-memorydb 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1329,6 +1319,16 @@ dependencies = [
  "ws 0.7.1 (git+https://github.com/tomusdrw/ws-rs)",
 ]
 
+[[package]]
+name = "keccak-hash"
+version = "0.1.0"
+dependencies = [
+ "cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-bigint 0.2.1",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1512,9 +1512,9 @@ dependencies = [
  "bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-bigint 0.2.1",
- "hash 0.1.0",
  "hashdb 0.1.1",
  "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
  "rlp 0.2.0",
 ]
 
@@ -1920,11 +1920,11 @@ dependencies = [
  "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.1.0",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "journaldb 0.1.0",
  "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
+ "keccak-hash 0.1.0",
  "kvdb 0.1.0",
  "kvdb-rocksdb 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1976,10 +1976,10 @@ dependencies = [
  "fetch 0.1.0",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.1.0",
  "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
  "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
+ "keccak-hash 0.1.0",
  "linked-hash-map 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2037,7 +2037,7 @@ dependencies = [
  "ethcore-util 1.9.0",
  "fetch 0.1.0",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.1.0",
+ "keccak-hash 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2123,7 +2123,6 @@ dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "hardware-wallet 1.9.0",
- "hash 0.1.0",
  "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
  "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
@@ -2131,6 +2130,7 @@ dependencies = [
  "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
  "jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
  "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
+ "keccak-hash 0.1.0",
  "kvdb-memorydb 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "macros 0.1.0",
@@ -2161,9 +2161,9 @@ name = "parity-rpc-client"
 version = "1.4.0"
 dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.1.0",
  "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
  "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
+ "keccak-hash 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-rpc 1.9.0",
@@ -2333,8 +2333,8 @@ dependencies = [
  "ethcore-bigint 0.2.1",
  "ethcore-bytes 0.1.0",
  "ethcore-logger 1.9.0",
- "hash 0.1.0",
  "hashdb 0.1.1",
+ "keccak-hash 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "memorydb 0.1.0",
  "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3246,7 +3246,7 @@ name = "triehash"
 version = "0.1.0"
 dependencies = [
  "ethcore-bigint 0.2.1",
- "hash 0.1.0",
+ "keccak-hash 0.1.0",
  "rlp 0.2.0",
 ]
 
@@ -3397,7 +3397,7 @@ dependencies = [
  "ethcore-bytes 0.1.0",
  "ethcore-util 1.9.0",
  "ethjson 0.1.0",
- "hash 0.1.0",
+ "keccak-hash 0.1.0",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "patricia-trie 0.1.0",
  "rlp 0.2.0",

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

@@ -43,7 +43,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

@@ -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

@@ -32,7 +32,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

@@ -13,4 +13,4 @@ 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;

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

@@ -56,7 +56,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

@@ -65,7 +65,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.8" }
 jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.8" }
 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

@@ -29,7 +29,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

@@ -45,7 +45,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

@@ -18,4 +18,4 @@ tokio-core = "0.1"
 tokio-io = "0.1"
 parking_lot = "0.4"
 ethcore-logger = { path = "../logger" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }

stratum/src/lib.rs

@@ -22,7 +22,7 @@ extern crate jsonrpc_macros;
 #[macro_use] extern crate log;
 extern crate ethcore_util as util;
 extern crate ethcore_bigint as bigint;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate parking_lot;
 
 #[cfg(test)] extern crate tokio_core;

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"

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/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/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

@@ -10,6 +10,6 @@ bigint = "4.0"
 elastic-array = "0.9"
 heapsize = "0.4"
 ethcore-bigint = { version = "0.2", path = "../bigint", features = ["heapsizeof"] }
-hash = { version = "0.1.0", path = "../hash" }
+keccak-hash = { version = "0.1.0", path = "../hash" }
 hashdb = { version = "0.1.0", path = "../hashdb" }
 rlp = { version = "0.2.0", path = "../rlp" }

util/memorydb/src/lib.rs

@@ -18,7 +18,7 @@
 extern crate heapsize;
 extern crate ethcore_bigint as bigint;
 extern crate rlp;
-extern crate hash as keccak;
+extern crate keccak_hash as keccak;
 extern crate hashdb;
 
 use std::mem;

util/network/Cargo.toml

@@ -31,7 +31,7 @@ rlp = { path = "../rlp" }
 path = { path = "../path" }
 ethcore-logger = { path ="../../logger" }
 ipnetwork = "0.12.6"
-hash = { path = "../hash" }
+keccak-hash = { path = "../hash" }
 snappy = { path = "../snappy" }
 serde_json = "1.0"
 

util/network/src/lib.rs

@@ -79,7 +79,7 @@ extern crate bytes;
 extern crate path;
 extern crate ethcore_logger;
 extern crate ipnetwork;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate serde_json;
 extern crate snappy;
 

util/patricia_trie/Cargo.toml

@@ -9,7 +9,7 @@ log = "0.3"
 rand = "0.3"
 ethcore-bytes = { version = "0.1.0", path = "../bytes" }
 ethcore-bigint = { version = "0.2.1", path = "../bigint" }
-hash = { version = "0.1.0", path = "../hash" }
+keccak-hash = { version = "0.1.0", path = "../hash" }
 hashdb = { version = "0.1.1", path = "../hashdb" }
 rlp = { version = "0.2.0", path = "../rlp" }
 triehash = { version = "0.1.0", path = "../triehash" }

util/patricia_trie/src/lib.rs

@@ -17,7 +17,7 @@
 //! Trie interface and implementation.
 extern crate rand;
 extern crate ethcore_bigint as bigint;
-extern crate hash as keccak;
+extern crate keccak_hash as keccak;
 extern crate rlp;
 extern crate hashdb;
 extern crate ethcore_bytes as bytes;

util/src/lib.rs

@@ -101,7 +101,7 @@ extern crate tiny_keccak;
 extern crate rlp;
 extern crate heapsize;
 extern crate ethcore_logger;
-extern crate hash as keccak;
+extern crate keccak_hash as keccak;
 extern crate hashdb;
 extern crate memorydb;
 extern crate patricia_trie as trie;

util/triehash/Cargo.toml

@@ -8,4 +8,4 @@ license = "GPL-3.0"
 [dependencies]
 rlp = { version = "0.2", path = "../rlp" }
 ethcore-bigint = { version = "0.2.1", path = "../bigint" }
-hash = { version = "0.1", path = "../hash" }
+keccak-hash = { version = "0.1", path = "../hash" }

util/triehash/src/lib.rs

@@ -19,7 +19,7 @@
 //! This module should be used to generate trie root hash.
 
 extern crate ethcore_bigint;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate rlp;
 
 use std::collections::BTreeMap;