From be092e7c092aa0a73f44c9eb0792a9dca8929354 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 10 Nov 2017 18:31:31 +0100 Subject: [PATCH 1/8] prepare cargo configuration for upload of crates --- Cargo.lock | 10 +++++----- ethcore/Cargo.toml | 2 +- ethcore/light/Cargo.toml | 2 +- ethcore/vm/Cargo.toml | 2 +- logger/Cargo.toml | 2 +- util/Cargo.toml | 2 +- util/bytes/Cargo.toml | 2 ++ util/hashdb/Cargo.toml | 4 +++- util/memorydb/Cargo.toml | 10 ++++++---- util/patricia_trie/Cargo.toml | 20 +++++++++----------- util/patricia_trie/src/triedbmut.rs | 1 + util/triehash/Cargo.toml | 2 ++ 12 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d139937f..103e86e7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -529,7 +529,7 @@ dependencies = [ "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-machine 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia_trie 0.1.0", + "patricia-trie 0.1.0", "price-info 1.7.0", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -616,7 +616,7 @@ dependencies = [ "memory-cache 0.1.0", "memorydb 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia_trie 0.1.0", + "patricia-trie 0.1.0", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.2.0", "rlp_derive 0.1.0", @@ -754,7 +754,7 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "memorydb 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia_trie 0.1.0", + "patricia-trie 0.1.0", "rlp 0.2.0", "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2340,7 +2340,7 @@ name = "path" version = "0.1.0" [[package]] -name = "patricia_trie" +name = "patricia-trie" version = "0.1.0" dependencies = [ "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3413,7 +3413,7 @@ dependencies = [ "ethjson 0.1.0", "hash 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia_trie 0.1.0", + "patricia-trie 0.1.0", "rlp 0.2.0", ] diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index 2f77b8cb3..581889445 100644 --- a/ethcore/Cargo.toml +++ b/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" } diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index 2b56a30bd..5f80bb654 100644 --- a/ethcore/light/Cargo.toml +++ b/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" } ethcore-devtools = { path = "../../devtools" } diff --git a/ethcore/vm/Cargo.toml b/ethcore/vm/Cargo.toml index 7f497a642..dd066dc7e 100644 --- a/ethcore/vm/Cargo.toml +++ b/ethcore/vm/Cargo.toml @@ -8,7 +8,7 @@ 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" } diff --git a/logger/Cargo.toml b/logger/Cargo.toml index fc63701c4..b3424ada1 100644 --- a/logger/Cargo.toml +++ b/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" diff --git a/util/Cargo.toml b/util/Cargo.toml index 9341a1bdd..a05a4d18f 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -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" } diff --git a/util/bytes/Cargo.toml b/util/bytes/Cargo.toml index 96dc0abb1..b20e38a2a 100644 --- a/util/bytes/Cargo.toml +++ b/util/bytes/Cargo.toml @@ -2,5 +2,7 @@ name = "ethcore-bytes" version = "0.1.0" authors = ["Parity Technologies "] +description = "byte utilities for Parity" +license = "GPL-3.0" [dependencies] diff --git a/util/hashdb/Cargo.toml b/util/hashdb/Cargo.toml index d74e47a7e..bd4fd8a16 100644 --- a/util/hashdb/Cargo.toml +++ b/util/hashdb/Cargo.toml @@ -2,7 +2,9 @@ name = "hashdb" version = "0.1.0" authors = ["Parity Technologies "] +description = "trait for hash-keyed databases." +license = "GPL-3.0" [dependencies] elastic-array = "0.9" -ethcore-bigint = { path = "../bigint" } +ethcore-bigint = { version = "0.1.3", path = "../bigint" } diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml index 1df95a049..f651f92d5 100644 --- a/util/memorydb/Cargo.toml +++ b/util/memorydb/Cargo.toml @@ -2,12 +2,14 @@ name = "memorydb" version = "0.1.0" authors = ["Parity Technologies "] +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.1.3", path = "../bigint", features = ["heapsizeof"] } +hash = { version = "0.1.0", path = "../hash" } +hashdb = { version = "0.1.0", path = "../hashdb" } +rlp = { version = "0.2.0", path = "../rlp" } diff --git a/util/patricia_trie/Cargo.toml b/util/patricia_trie/Cargo.toml index 5886a4e35..295bae867 100644 --- a/util/patricia_trie/Cargo.toml +++ b/util/patricia_trie/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "patricia_trie" +name = "patricia-trie" version = "0.1.0" authors = ["Parity Technologies "] @@ -7,13 +7,11 @@ authors = ["Parity Technologies "] elastic-array = "0.9" log = "0.3" rand = "0.3" -ethcore-bytes = { path = "../bytes" } -ethcore-bigint = { path = "../bigint" } -hash = { path = "../hash" } -hashdb = { path = "../hashdb" } -rlp = { path = "../rlp" } -triehash = { path = "../triehash" } -memorydb = { path = "../memorydb" } -ethcore-logger = { path = "../../logger" } - - +ethcore-bytes = { version = "0.1.0", path = "../bytes" } +ethcore-bigint = { version = "0.1.3", path = "../bigint" } +hash = { version = "0.1.0", path = "../hash" } +hashdb = { version = "0.1.0", path = "../hashdb" } +rlp = { version = "0.2.0", path = "../rlp" } +triehash = { version = "0.1.0", path = "../triehash" } +memorydb = { version = "0.1.0", path = "../memorydb" } +ethcore-logger = { version = "1.9.0", path = "../../logger" } diff --git a/util/patricia_trie/src/triedbmut.rs b/util/patricia_trie/src/triedbmut.rs index d0e22d2fb..97c3c93e7 100644 --- a/util/patricia_trie/src/triedbmut.rs +++ b/util/patricia_trie/src/triedbmut.rs @@ -942,6 +942,7 @@ impl<'a> Drop for TrieDBMut<'a> { #[cfg(test)] mod tests { extern crate triehash; + use self::triehash::trie_root; use hashdb::*; use memorydb::*; diff --git a/util/triehash/Cargo.toml b/util/triehash/Cargo.toml index cc18a6ea8..1fae40dfc 100644 --- a/util/triehash/Cargo.toml +++ b/util/triehash/Cargo.toml @@ -2,6 +2,8 @@ name = "triehash" version = "0.1.0" authors = ["Parity Technologies "] +description = "in memory patricia trie operations" +license = "GPL-3.0" [dependencies] rlp = { path = "../rlp" } From 5423518e1efcf64bf4153c634d690f37ab798226 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 10 Nov 2017 18:43:18 +0100 Subject: [PATCH 2/8] update bigint version number --- util/memorydb/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml index f651f92d5..0c2f954e1 100644 --- a/util/memorydb/Cargo.toml +++ b/util/memorydb/Cargo.toml @@ -9,7 +9,7 @@ license = "GPL-3.0" bigint = "4.0" elastic-array = "0.9" heapsize = "0.4" -ethcore-bigint = { version = "0.1.3", path = "../bigint", features = ["heapsizeof"] } +ethcore-bigint = { version = "0.2", path = "../bigint", features = ["heapsizeof"] } hash = { version = "0.1.0", path = "../hash" } hashdb = { version = "0.1.0", path = "../hashdb" } rlp = { version = "0.2.0", path = "../rlp" } From 5c8f39c3bd452174b5126635a9e7a7af2fa3f979 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 10 Nov 2017 18:46:35 +0100 Subject: [PATCH 3/8] update ethcore-bigint version --- Cargo.lock | 12 ++++++------ util/hashdb/Cargo.toml | 4 ++-- util/patricia_trie/Cargo.toml | 4 ++-- util/triehash/Cargo.toml | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 177b1b5be..d2f8485cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -494,7 +494,7 @@ dependencies = [ "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.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)", @@ -731,7 +731,7 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-logger 1.9.0", "hash 0.1.0", - "hashdb 0.1.0", + "hashdb 0.1.1", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "journaldb 0.1.0", "kvdb 0.1.0", @@ -1037,7 +1037,7 @@ dependencies = [ [[package]] name = "hashdb" -version = "0.1.0" +version = "0.1.1" dependencies = [ "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.2.1", @@ -1223,7 +1223,7 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-logger 1.9.0", "hash 0.1.0", - "hashdb 0.1.0", + "hashdb 0.1.1", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0", "kvdb-memorydb 0.1.0", @@ -1513,7 +1513,7 @@ dependencies = [ "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.0", + "hashdb 0.1.1", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.2.0", ] @@ -2334,7 +2334,7 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-logger 1.9.0", "hash 0.1.0", - "hashdb 0.1.0", + "hashdb 0.1.1", "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)", diff --git a/util/hashdb/Cargo.toml b/util/hashdb/Cargo.toml index bd4fd8a16..0060afbaa 100644 --- a/util/hashdb/Cargo.toml +++ b/util/hashdb/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "hashdb" -version = "0.1.0" +version = "0.1.1" authors = ["Parity Technologies "] description = "trait for hash-keyed databases." license = "GPL-3.0" [dependencies] elastic-array = "0.9" -ethcore-bigint = { version = "0.1.3", path = "../bigint" } +ethcore-bigint = { version = "0.2.1", path = "../bigint" } diff --git a/util/patricia_trie/Cargo.toml b/util/patricia_trie/Cargo.toml index 295bae867..7b5ae3879 100644 --- a/util/patricia_trie/Cargo.toml +++ b/util/patricia_trie/Cargo.toml @@ -8,9 +8,9 @@ elastic-array = "0.9" log = "0.3" rand = "0.3" ethcore-bytes = { version = "0.1.0", path = "../bytes" } -ethcore-bigint = { version = "0.1.3", path = "../bigint" } +ethcore-bigint = { version = "0.2.1", path = "../bigint" } hash = { version = "0.1.0", path = "../hash" } -hashdb = { version = "0.1.0", path = "../hashdb" } +hashdb = { version = "0.1.1", path = "../hashdb" } rlp = { version = "0.2.0", path = "../rlp" } triehash = { version = "0.1.0", path = "../triehash" } memorydb = { version = "0.1.0", path = "../memorydb" } diff --git a/util/triehash/Cargo.toml b/util/triehash/Cargo.toml index 1fae40dfc..2731a4685 100644 --- a/util/triehash/Cargo.toml +++ b/util/triehash/Cargo.toml @@ -6,6 +6,6 @@ description = "in memory patricia trie operations" license = "GPL-3.0" [dependencies] -rlp = { path = "../rlp" } -ethcore-bigint = { path = "../bigint" } -hash = { path = "../hash" } +rlp = { version = "0.2", path = "../rlp" } +ethcore-bigint = { version = "0.2.1", path = "../bigint" } +hash = { version = "0.1", path = "../hash" } From ec5519ccd153fd62ebbd501bebe1f8553f85d1cf Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 10 Nov 2017 19:04:55 +0100 Subject: [PATCH 4/8] rename hash crate to keccak-hash --- Cargo.lock | 62 +++++++++++++++++------------------ Cargo.toml | 2 +- dapps/Cargo.toml | 2 +- dapps/src/lib.rs | 2 +- ethash/Cargo.toml | 2 +- ethash/src/keccak.rs | 2 +- ethcore/Cargo.toml | 2 +- ethcore/evm/Cargo.toml | 2 +- ethcore/evm/src/lib.rs | 2 +- ethcore/light/Cargo.toml | 2 +- ethcore/light/src/lib.rs | 2 +- ethcore/src/lib.rs | 2 +- ethcore/types/Cargo.toml | 2 +- ethcore/types/src/lib.rs | 2 +- ethcore/vm/Cargo.toml | 2 +- ethcore/vm/src/lib.rs | 2 +- hash-fetch/Cargo.toml | 2 +- hash-fetch/src/lib.rs | 2 +- parity/main.rs | 2 +- rpc/Cargo.toml | 2 +- rpc/src/lib.rs | 2 +- rpc_client/Cargo.toml | 2 +- rpc_client/src/lib.rs | 2 +- secret_store/Cargo.toml | 2 +- secret_store/src/lib.rs | 2 +- stratum/Cargo.toml | 2 +- stratum/src/lib.rs | 2 +- sync/Cargo.toml | 2 +- sync/src/lib.rs | 2 +- util/Cargo.toml | 2 +- util/bloomable/Cargo.toml | 2 +- util/bloomable/tests/test.rs | 2 +- util/hash/Cargo.toml | 4 +-- util/journaldb/Cargo.toml | 2 +- util/journaldb/src/lib.rs | 2 +- util/memorydb/Cargo.toml | 2 +- util/memorydb/src/lib.rs | 2 +- util/network/Cargo.toml | 2 +- util/network/src/lib.rs | 2 +- util/patricia_trie/Cargo.toml | 2 +- util/patricia_trie/src/lib.rs | 2 +- util/src/lib.rs | 2 +- util/triehash/Cargo.toml | 2 +- util/triehash/src/lib.rs | 2 +- 44 files changed, 75 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d2f8485cb..240765c6c 100644 --- a/Cargo.lock +++ b/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", diff --git a/Cargo.toml b/Cargo.toml index a953dcef8..26dd940a6 100644 --- a/Cargo.toml +++ b/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" } diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index c0e856791..cd8497954 100644 --- a/dapps/Cargo.toml +++ b/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} diff --git a/dapps/src/lib.rs b/dapps/src/lib.rs index 36b5bec4c..9198222ee 100644 --- a/dapps/src/lib.rs +++ b/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; diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml index e60d63c22..b6986af83 100644 --- a/ethash/Cargo.toml +++ b/ethash/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Parity Technologies "] [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" diff --git a/ethash/src/keccak.rs b/ethash/src/keccak.rs index 752b0230b..8ca4f5438 100644 --- a/ethash/src/keccak.rs +++ b/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 . -extern crate hash; +extern crate keccak_hash as hash; pub type H256 = [u8; 32]; diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index 581889445..56f06d1bf 100644 --- a/ethcore/Cargo.toml +++ b/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" } diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml index 5cef517f4..b57e599bb 100644 --- a/ethcore/evm/Cargo.toml +++ b/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" } diff --git a/ethcore/evm/src/lib.rs b/ethcore/evm/src/lib.rs index 7ddbed19e..8a250f847 100644 --- a/ethcore/evm/src/lib.rs +++ b/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] diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index 5f80bb654..178a46650 100644 --- a/ethcore/light/Cargo.toml +++ b/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" } diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs index f9c3d89b8..039ed0e79 100644 --- a/ethcore/light/src/lib.rs +++ b/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; diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs index 4620cc892..b969a39dd 100644 --- a/ethcore/src/lib.rs +++ b/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; diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml index 73d7b2932..5e037c2a4 100644 --- a/ethcore/types/Cargo.toml +++ b/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] diff --git a/ethcore/types/src/lib.rs b/ethcore/types/src/lib.rs index 85d36b200..51e2890d4 100644 --- a/ethcore/types/src/lib.rs +++ b/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)] diff --git a/ethcore/vm/Cargo.toml b/ethcore/vm/Cargo.toml index dd066dc7e..24e75be2e 100644 --- a/ethcore/vm/Cargo.toml +++ b/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" } diff --git a/ethcore/vm/src/lib.rs b/ethcore/vm/src/lib.rs index 1f88bf625..08f0aa639 100644 --- a/ethcore/vm/src/lib.rs +++ b/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; diff --git a/hash-fetch/Cargo.toml b/hash-fetch/Cargo.toml index 7b0e8b7cd..312aa028c 100644 --- a/hash-fetch/Cargo.toml +++ b/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" diff --git a/hash-fetch/src/lib.rs b/hash-fetch/src/lib.rs index 858a04ea5..0610459ee 100644 --- a/hash-fetch/src/lib.rs +++ b/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; diff --git a/parity/main.rs b/parity/main.rs index 10e825d8b..eae471dce 100644 --- a/parity/main.rs +++ b/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] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 360a7b776..f257a0b68 100644 --- a/rpc/Cargo.toml +++ b/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} diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index ab0b9082d..ed8d1d972 100644 --- a/rpc/src/lib.rs +++ b/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] diff --git a/rpc_client/Cargo.toml b/rpc_client/Cargo.toml index cada20fa1..d1526661e 100644 --- a/rpc_client/Cargo.toml +++ b/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" } diff --git a/rpc_client/src/lib.rs b/rpc_client/src/lib.rs index 680c0484b..6b2bfc5cf 100644 --- a/rpc_client/src/lib.rs +++ b/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; diff --git a/secret_store/Cargo.toml b/secret_store/Cargo.toml index 8357b530b..5ba7d5773 100644 --- a/secret_store/Cargo.toml +++ b/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" } diff --git a/secret_store/src/lib.rs b/secret_store/src/lib.rs index 5951be508..80242c078 100644 --- a/secret_store/src/lib.rs +++ b/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; diff --git a/stratum/Cargo.toml b/stratum/Cargo.toml index 911e2ad0e..4216dabb5 100644 --- a/stratum/Cargo.toml +++ b/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" } diff --git a/stratum/src/lib.rs b/stratum/src/lib.rs index 229f36acc..a647ac8e8 100644 --- a/stratum/src/lib.rs +++ b/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; diff --git a/sync/Cargo.toml b/sync/Cargo.toml index a1941fec4..9eebda261 100644 --- a/sync/Cargo.toml +++ b/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" } diff --git a/sync/src/lib.rs b/sync/src/lib.rs index 0495d72a7..4e9873c6e 100644 --- a/sync/src/lib.rs +++ b/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; diff --git a/util/Cargo.toml b/util/Cargo.toml index a05a4d18f..65d1c88b4 100644 --- a/util/Cargo.toml +++ b/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" diff --git a/util/bloomable/Cargo.toml b/util/bloomable/Cargo.toml index 94ca4856b..d919e2163 100644 --- a/util/bloomable/Cargo.toml +++ b/util/bloomable/Cargo.toml @@ -7,4 +7,4 @@ authors = ["debris "] ethcore-bigint = { path = "../bigint" } [dev-dependencies] -hash = { path = "../hash" } +keccak-hash = { path = "../hash" } diff --git a/util/bloomable/tests/test.rs b/util/bloomable/tests/test.rs index f3fa908e2..6e9cde484 100644 --- a/util/bloomable/tests/test.rs +++ b/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; diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 0b0502721..e4225c85c 100644 --- a/util/hash/Cargo.toml +++ b/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 "] build = "build.rs" [dependencies] -ethcore-bigint = { path = "../bigint" } +ethcore-bigint = { version = "0.2.1", path = "../bigint" } tiny-keccak = "1.3" [build-dependencies] diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml index a70631836..3d92d9ed6 100644 --- a/util/journaldb/Cargo.toml +++ b/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" } diff --git a/util/journaldb/src/lib.rs b/util/journaldb/src/lib.rs index ef26cb8d6..1e805abe6 100644 --- a/util/journaldb/src/lib.rs +++ b/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; diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml index 0c2f954e1..a8c6230d1 100644 --- a/util/memorydb/Cargo.toml +++ b/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" } diff --git a/util/memorydb/src/lib.rs b/util/memorydb/src/lib.rs index 041d97250..d8e342d98 100644 --- a/util/memorydb/src/lib.rs +++ b/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; diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml index d7928b492..8c4d2398b 100644 --- a/util/network/Cargo.toml +++ b/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" diff --git a/util/network/src/lib.rs b/util/network/src/lib.rs index 6cf81fa9d..730a368a6 100644 --- a/util/network/src/lib.rs +++ b/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; diff --git a/util/patricia_trie/Cargo.toml b/util/patricia_trie/Cargo.toml index 7b5ae3879..a7b1fa421 100644 --- a/util/patricia_trie/Cargo.toml +++ b/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" } diff --git a/util/patricia_trie/src/lib.rs b/util/patricia_trie/src/lib.rs index 8c4c0d3ef..07fd43bdf 100644 --- a/util/patricia_trie/src/lib.rs +++ b/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; diff --git a/util/src/lib.rs b/util/src/lib.rs index 6d5db7938..321c85dd4 100644 --- a/util/src/lib.rs +++ b/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; diff --git a/util/triehash/Cargo.toml b/util/triehash/Cargo.toml index 2731a4685..d9ff4809c 100644 --- a/util/triehash/Cargo.toml +++ b/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" } diff --git a/util/triehash/src/lib.rs b/util/triehash/src/lib.rs index d166aa5d0..78c22fb87 100644 --- a/util/triehash/src/lib.rs +++ b/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; From 75cfab855942ecbe200a8510024d0a4986d13f33 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 10 Nov 2017 20:15:37 +0100 Subject: [PATCH 5/8] update memorydb --- Cargo.lock | 12 ++++++------ util/memorydb/Cargo.toml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 240765c6c..8e5aea5f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,7 +508,7 @@ dependencies = [ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "memory-cache 0.1.0", - "memorydb 0.1.0", + "memorydb 0.1.1", "migration 0.1.0", "native-contracts 0.1.0", "num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", @@ -600,7 +600,7 @@ dependencies = [ "kvdb-rocksdb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "memory-cache 0.1.0", - "memorydb 0.1.0", + "memorydb 0.1.1", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "patricia-trie 0.1.0", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -738,7 +738,7 @@ dependencies = [ "kvdb-memorydb 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)", - "memorydb 0.1.0", + "memorydb 0.1.1", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "patricia-trie 0.1.0", "rlp 0.2.0", @@ -1218,7 +1218,7 @@ dependencies = [ "kvdb 0.1.0", "kvdb-memorydb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memorydb 0.1.0", + "memorydb 0.1.1", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.2.0", "util-error 0.1.0", @@ -1507,7 +1507,7 @@ dependencies = [ [[package]] name = "memorydb" -version = "0.1.0" +version = "0.1.1" 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)", @@ -2336,7 +2336,7 @@ dependencies = [ "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", + "memorydb 0.1.1", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.2.0", "triehash 0.1.0", diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml index a8c6230d1..785f16590 100644 --- a/util/memorydb/Cargo.toml +++ b/util/memorydb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "memorydb" -version = "0.1.0" +version = "0.1.1" authors = ["Parity Technologies "] description = "in-memory implementation of hashdb" license = "GPL-3.0" @@ -11,5 +11,5 @@ elastic-array = "0.9" heapsize = "0.4" ethcore-bigint = { version = "0.2", path = "../bigint", features = ["heapsizeof"] } keccak-hash = { version = "0.1.0", path = "../hash" } -hashdb = { version = "0.1.0", path = "../hashdb" } +hashdb = { version = "0.1.1", path = "../hashdb" } rlp = { version = "0.2.0", path = "../rlp" } From cffbf3cab1659454a735a56b42a4fe6f39b9d400 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 10 Nov 2017 20:21:24 +0100 Subject: [PATCH 6/8] update rlp --- Cargo.lock | 42 +++++++++++++++++------------------ util/memorydb/Cargo.toml | 2 +- util/patricia_trie/Cargo.toml | 2 +- util/rlp/Cargo.toml | 4 ++-- util/triehash/Cargo.toml | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e5aea5f7..288decc43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -286,7 +286,7 @@ dependencies = [ "ethjson 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 0.2.1", "rlp_derive 0.1.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -519,7 +519,7 @@ dependencies = [ "price-info 1.7.0", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "rlp_derive 0.1.0", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -604,7 +604,7 @@ dependencies = [ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "patricia-trie 0.1.0", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "rlp_derive 0.1.0", "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -654,7 +654,7 @@ dependencies = [ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -741,7 +741,7 @@ dependencies = [ "memorydb 0.1.1", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "patricia-trie 0.1.0", - "rlp 0.2.0", + "rlp 0.2.1", "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -862,7 +862,7 @@ dependencies = [ "macros 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1220,7 +1220,7 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "memorydb 0.1.1", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "util-error 0.1.0", ] @@ -1353,7 +1353,7 @@ version = "0.1.0" dependencies = [ "kvdb 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", ] [[package]] @@ -1366,7 +1366,7 @@ dependencies = [ "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)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1515,7 +1515,7 @@ dependencies = [ "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", + "rlp 0.2.1", ] [[package]] @@ -1947,7 +1947,7 @@ dependencies = [ "path 0.1.0", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "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)", @@ -2060,7 +2060,7 @@ dependencies = [ "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)", "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2075,7 +2075,7 @@ dependencies = [ "kvdb 0.1.0", "kvdb-memorydb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2142,7 +2142,7 @@ dependencies = [ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2280,7 +2280,7 @@ dependencies = [ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2338,7 +2338,7 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "memorydb 0.1.1", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "triehash 0.1.0", ] @@ -2616,7 +2616,7 @@ dependencies = [ [[package]] name = "rlp" -version = "0.2.0" +version = "0.2.1" dependencies = [ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2630,7 +2630,7 @@ name = "rlp_derive" version = "0.1.0" dependencies = [ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.0", + "rlp 0.2.1", "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3247,7 +3247,7 @@ version = "0.1.0" dependencies = [ "ethcore-bigint 0.2.1", "keccak-hash 0.1.0", - "rlp 0.2.0", + "rlp 0.2.1", ] [[package]] @@ -3350,7 +3350,7 @@ dependencies = [ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.2.1", "kvdb 0.1.0", - "rlp 0.2.0", + "rlp 0.2.1", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3400,7 +3400,7 @@ dependencies = [ "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", + "rlp 0.2.1", ] [[package]] diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml index 785f16590..4ea50a736 100644 --- a/util/memorydb/Cargo.toml +++ b/util/memorydb/Cargo.toml @@ -12,4 +12,4 @@ heapsize = "0.4" 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.0", path = "../rlp" } +rlp = { version = "0.2.1", path = "../rlp" } diff --git a/util/patricia_trie/Cargo.toml b/util/patricia_trie/Cargo.toml index a7b1fa421..ee9d472a0 100644 --- a/util/patricia_trie/Cargo.toml +++ b/util/patricia_trie/Cargo.toml @@ -11,7 +11,7 @@ ethcore-bytes = { version = "0.1.0", path = "../bytes" } ethcore-bigint = { version = "0.2.1", path = "../bigint" } keccak-hash = { version = "0.1.0", path = "../hash" } hashdb = { version = "0.1.1", path = "../hashdb" } -rlp = { version = "0.2.0", path = "../rlp" } +rlp = { version = "0.2.1", path = "../rlp" } triehash = { version = "0.1.0", path = "../triehash" } memorydb = { version = "0.1.0", path = "../memorydb" } ethcore-logger = { version = "1.9.0", path = "../../logger" } diff --git a/util/rlp/Cargo.toml b/util/rlp/Cargo.toml index aa682e469..83ac3a9d6 100644 --- a/util/rlp/Cargo.toml +++ b/util/rlp/Cargo.toml @@ -3,12 +3,12 @@ description = "Recursive-length prefix encoding, decoding, and compression" repository = "https://github.com/paritytech/parity" license = "MIT/Apache-2.0" name = "rlp" -version = "0.2.0" +version = "0.2.1" authors = ["Parity Technologies "] [dependencies] elastic-array = "0.9" -ethcore-bigint = { path = "../bigint" } +ethcore-bigint = { version = "0.2.1", path = "../bigint" } lazy_static = "0.2" rustc-hex = "1.0" byteorder = "1.0" diff --git a/util/triehash/Cargo.toml b/util/triehash/Cargo.toml index d9ff4809c..53d6b56d8 100644 --- a/util/triehash/Cargo.toml +++ b/util/triehash/Cargo.toml @@ -6,6 +6,6 @@ description = "in memory patricia trie operations" license = "GPL-3.0" [dependencies] -rlp = { version = "0.2", path = "../rlp" } +rlp = { version = "0.2.1", path = "../rlp" } ethcore-bigint = { version = "0.2.1", path = "../bigint" } keccak-hash = { version = "0.1", path = "../hash" } From c4466f450b4e2e62df27e686a8497130fb1e0a3d Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 10 Nov 2017 20:26:19 +0100 Subject: [PATCH 7/8] update patricia-trie cargo.toml --- util/patricia_trie/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/patricia_trie/Cargo.toml b/util/patricia_trie/Cargo.toml index ee9d472a0..ae0027cf4 100644 --- a/util/patricia_trie/Cargo.toml +++ b/util/patricia_trie/Cargo.toml @@ -2,6 +2,8 @@ name = "patricia-trie" version = "0.1.0" authors = ["Parity Technologies "] +description = "Merkle-Patricia Trie (Ethereum Style)" +license = "GPL-3.0" [dependencies] elastic-array = "0.9" From 6fabb56104fcf6a345f54273a696de81ac73c4b6 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 17 Nov 2017 17:12:12 +0100 Subject: [PATCH 8/8] fix tests on patricia-trie --- Cargo.lock | 5 ++++- stratum/Cargo.toml | 3 +-- stratum/src/lib.rs | 3 ++- util/patricia_trie/src/triedbmut.rs | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ac8bdd15..044bf2b03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,6 +424,9 @@ dependencies = [ name = "error-chain" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "backtrace 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "eth-secp256k1" @@ -705,7 +708,6 @@ dependencies = [ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.2.1", "ethcore-logger 1.9.0", - "ethcore-util 1.9.0", "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)", "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)", "jsonrpc-tcp-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)", @@ -2131,6 +2133,7 @@ dependencies = [ "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)", "jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)", "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)", + "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", diff --git a/stratum/Cargo.toml b/stratum/Cargo.toml index eed15b4f0..d7245796e 100644 --- a/stratum/Cargo.toml +++ b/stratum/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Parity Technologies "] [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" } @@ -21,4 +21,3 @@ tokio-core = "0.1" tokio-io = "0.1" parking_lot = "0.4" ethcore-logger = { path = "../logger" } -keccak-hash = { path = "../util/hash" } diff --git a/stratum/src/lib.rs b/stratum/src/lib.rs index 20bddf2f6..ebe90e8e4 100644 --- a/stratum/src/lib.rs +++ b/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 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; diff --git a/util/patricia_trie/src/triedbmut.rs b/util/patricia_trie/src/triedbmut.rs index 97c3c93e7..d0bef2181 100644 --- a/util/patricia_trie/src/triedbmut.rs +++ b/util/patricia_trie/src/triedbmut.rs @@ -262,12 +262,12 @@ impl<'a> Index<&'a StorageHandle> for NodeStorage { /// # Example /// ``` /// extern crate patricia_trie as trie; +/// extern crate keccak_hash; /// extern crate hashdb; /// extern crate memorydb; /// extern crate ethcore_bigint as bigint; -/// extern crate hash; /// -/// use hash::KECCAK_NULL_RLP; +/// use keccak_hash::KECCAK_NULL_RLP; /// use trie::*; /// use hashdb::*; /// use memorydb::*;