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" }