grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix tests on patricia-trie

Browse Source
This commit is contained in:
Robert Habermeier 2017-11-17 17:12:12 +01:00
parent 81212c5031
commit 6fabb56104
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -424,6 +424,9 @@ dependencies = [
name = "error-chain" name = "error-chain"
version = "0.11.0" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" 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]] [[package]]
name = "eth-secp256k1" name = "eth-secp256k1"
@ -705,7 +708,6 @@ dependencies = [
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1", "ethcore-bigint 0.2.1",
"ethcore-logger 1.9.0", "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-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-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)", "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-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-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)", "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", "kvdb-memorydb 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"macros 0.1.0", "macros 0.1.0",

3
stratum/Cargo.toml
View File

@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies] [dependencies]
ethcore-bigint = { path = "../util/bigint" } ethcore-bigint = { path = "../util/bigint" }
ethcore-logger = { path = "../logger" } 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-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-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" } 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" tokio-io = "0.1"
parking_lot = "0.4" parking_lot = "0.4"
ethcore-logger = { path = "../logger" } ethcore-logger = { path = "../logger" }
keccak-hash = { path = "../util/hash" }

3
stratum/src/lib.rs
View File

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

4
util/patricia_trie/src/triedbmut.rs
View File

@ -262,12 +262,12 @@ impl<'a> Index<&'a StorageHandle> for NodeStorage {
/// # Example /// # Example
/// ``` /// ```
/// extern crate patricia_trie as trie; /// extern crate patricia_trie as trie;
/// extern crate keccak_hash;
/// extern crate hashdb; /// extern crate hashdb;
/// extern crate memorydb; /// extern crate memorydb;
/// extern crate ethcore_bigint as bigint; /// extern crate ethcore_bigint as bigint;
/// extern crate hash;
/// ///
/// use hash::KECCAK_NULL_RLP; /// use keccak_hash::KECCAK_NULL_RLP;
/// use trie::*; /// use trie::*;
/// use hashdb::*; /// use hashdb::*;
/// use memorydb::*; /// use memorydb::*;