separate trie from util and make its dependencies into libs

Cargo.toml

@@ -35,6 +35,7 @@ jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "pa
 ethsync = { path = "sync" }
 ethcore = { path = "ethcore" }
 ethcore-util = { path = "util" }
+ethcore-bytes = { path = "util/bytes" }
 ethcore-bigint = { path = "util/bigint" }
 ethcore-io = { path = "util/io" }
 ethcore-devtools = { path = "devtools" }

dapps/Cargo.toml

@@ -32,6 +32,7 @@ jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branc
 
 ethcore-util = { path = "../util" }
 ethcore-bigint = { path = "../util/bigint" }
+ethcore-bytes = { path = "../util/bytes" }
 fetch = { path = "../util/fetch" }
 node-health = { path = "./node-health" }
 parity-hash-fetch = { path = "../hash-fetch" }

dapps/src/apps/fetcher/mod.rs

@@ -261,7 +261,7 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 mod tests {
 	use std::env;
 	use std::sync::Arc;
-	use util::Bytes;
+	use bytes::Bytes;
 	use fetch::{Fetch, Client};
 	use futures::{future, Future, BoxFuture};
 	use hash_fetch::urlhint::{URLHint, URLHintResult};

dapps/src/lib.rs

@@ -39,6 +39,7 @@ extern crate jsonrpc_http_server;
 
 extern crate ethcore_util as util;
 extern crate ethcore_bigint as bigint;
+extern crate ethcore_bytes as bytes;
 extern crate fetch;
 extern crate node_health;
 extern crate parity_dapps_glue as parity_dapps;

dapps/src/tests/helpers/registrar.rs

@@ -21,7 +21,8 @@ use rustc_hex::FromHex;
 
 use hash_fetch::urlhint::ContractClient;
 use bigint::hash::H256;
-use util::{Bytes, Address, ToPretty};
+use util::Address;
+use bytes::{Bytes, ToPretty};
 use parking_lot::Mutex;
 
 const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";

ethcore/Cargo.toml

@@ -23,6 +23,10 @@ env_logger = "0.4"
 ethabi = "2.0"
 ethash = { path = "../ethash" }
 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" }
 ethcore-devtools = { path = "../devtools" }
 ethcore-io = { path = "../util/io" }
 ethcore-ipc = { path = "../ipc/rpc" }

ethcore/light/Cargo.toml

@@ -15,6 +15,9 @@ log = "0.3"
 ethcore = { path = ".."}
 ethcore-util = { path = "../../util" }
 ethcore-bigint = { path = "../../util/bigint" }
+ethcore-bytes = { path = "../../util/bytes" }
+memorydb = { path = "../../util/memorydb" }
+patricia_trie = { path = "../../util/patricia_trie" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
 ethcore-ipc = { path = "../../ipc/rpc", optional = true }

ethcore/light/src/cht.rs

@@ -23,8 +23,9 @@
 use ethcore::ids::BlockId;
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::{Bytes, HashDB, MemoryDB};
-use util::trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
+use util::{HashDB, MemoryDB};
+use bytes::Bytes;
+use trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
 use rlp::{RlpStream, UntrustedRlp};
 
 // encode a key.

ethcore/light/src/lib.rs

@@ -71,11 +71,14 @@ extern crate ethcore_io as io;
 extern crate ethcore_network as network;
 extern crate ethcore_util as util;
 extern crate ethcore_bigint as bigint;
+extern crate ethcore_bytes as bytes;
 extern crate ethcore;
 extern crate evm;
 extern crate heapsize;
 extern crate futures;
 extern crate itertools;
+extern crate memorydb;
+extern crate patricia_trie as trie;
 extern crate rand;
 extern crate rlp;
 extern crate parking_lot;

ethcore/light/src/on_demand/request.rs

@@ -33,9 +33,10 @@ use rlp::{RlpStream, UntrustedRlp};
 use bigint::prelude::U256;
 use bigint::hash::H256;
 use parking_lot::Mutex;
-use util::{Address, Bytes, DBValue, HashDB};
-use util::memorydb::MemoryDB;
-use util::trie::{Trie, TrieDB, TrieError};
+use util::{Address, DBValue, HashDB};
+use bytes::Bytes;
+use memorydb::MemoryDB;
+use trie::{Trie, TrieDB, TrieError};
 
 const SUPPLIED_MATCHES: &'static str = "supplied responses always match produced requests; enforced by `check_response`; qed";
 
@@ -896,8 +897,8 @@ mod tests {
 	use bigint::hash::H256;
 	use util::{MemoryDB, Address};
 	use parking_lot::Mutex;
-	use util::trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
-	use util::trie::recorder::Recorder;
+	use trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
+	use trie::recorder::Recorder;
 	use hash::keccak;
 
 	use ethcore::client::{BlockChainClient, TestBlockChainClient, EachBlockWith};