From 6fabb56104fcf6a345f54273a696de81ac73c4b6 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Fri, 17 Nov 2017 17:12:12 +0100
Subject: [PATCH] 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 <admin@parity.io>"]
 [dependencies]
 ethcore-bigint = { path = "../util/bigint" }
 ethcore-logger = { path = "../logger" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
@@ -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::*;