separate trie from util and make its dependencies into libs:

* bytes
* hashdb
* memorydb
* nibbleslice
* nibblevec

ethcore/src/client/chain_notify.rs

@@ -16,7 +16,7 @@
 
 use ipc::IpcConfig;
 use bigint::hash::H256;
-use util::Bytes;
+use bytes::Bytes;
 
 /// Represents what has to be handled by actor listening to chain events
 #[ipc]

ethcore/src/client/client.rs

@@ -25,11 +25,10 @@ use itertools::Itertools;
 // util
 use hash::keccak;
 use timer::PerfTimer;
-use util::UtilError;
-use util::Bytes;
-use util::{journaldb, DBValue, TrieFactory, Trie};
-use util::Address;
-use util::trie::TrieSpec;
+use bytes::Bytes;
+use util::{journaldb, DBValue};
+use util::{Address, UtilError};
+use trie::{TrieSpec, TrieFactory, Trie};
 use util::kvdb::*;
 
 // other

ethcore/src/client/error.rs

@@ -17,7 +17,7 @@
 use util::UtilError;
 use std::fmt::{Display, Formatter, Error as FmtError};
 
-use util::trie::TrieError;
+use trie::TrieError;
 
 /// Client configuration errors.
 #[derive(Debug)]

ethcore/src/client/evm_test_client.rs

@@ -20,7 +20,9 @@ use std::fmt;
 use std::sync::Arc;
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::{self, journaldb, trie};
+use util::journaldb;
+use trie;
+use bytes;
 use util::kvdb::{self, KeyValueDB};
 use {state, state_db, client, executive, trace, transaction, db, spec, pod_state};
 use factory::Factories;
@@ -31,7 +33,7 @@ use vm::{self, ActionParams};
 #[derive(Debug)]
 pub enum EvmTestError {
 	/// Trie integrity error.
-	Trie(util::TrieError),
+	Trie(trie::TrieError),
 	/// EVM error.
 	Evm(vm::Error),
 	/// Initialization error.
@@ -179,7 +181,7 @@ impl<'a> EvmTestClient<'a> {
 		let (gas_left, _) = executive.call(
 			params,
 			&mut substate,
-			util::BytesRef::Flexible(&mut output),
+			bytes::BytesRef::Flexible(&mut output),
 			&mut tracer,
 			vm_tracer,
 		).map_err(EvmTestError::Evm)?;

ethcore/src/client/test_client.rs

@@ -27,6 +27,7 @@ use bigint::prelude::U256;
 use bigint::hash::H256;
 use parking_lot::RwLock;
 use util::*;
+use bytes::Bytes;
 use rlp::*;
 use ethkey::{Generator, Random};
 use devtools::*;

ethcore/src/client/traits.rs

@@ -36,8 +36,9 @@ use verification::queue::QueueInfo as BlockQueueInfo;
 
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::{Address, Bytes};
-use util::hashdb::DBValue;
+use util::Address;
+use bytes::Bytes;
+use hashdb::DBValue;
 
 use types::ids::*;
 use types::basic_account::BasicAccount;