Don't reexport bigint from util

ethcore/src/client/chain_notify.rs

@@ -15,7 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use ipc::IpcConfig;
-use util::{H256, Bytes};
+use bigint::hash::H256;
+use util::Bytes;
 
 /// Represents what has to be handled by actor listening to chain events
 #[ipc]

ethcore/src/client/client.rs

@@ -26,11 +26,13 @@ use itertools::Itertools;
 use hash::keccak;
 use util::{Bytes, PerfTimer, Mutex, RwLock, MutexGuard};
 use util::{journaldb, DBValue, TrieFactory, Trie};
-use util::{U256, H256, Address, H2048};
+use util::Address;
 use util::trie::TrieSpec;
 use util::kvdb::*;
 
 // other
+use bigint::prelude::U256;
+use bigint::hash::{H256, H2048};
 use basic_types::Seal;
 use block::*;
 use blockchain::{BlockChain, BlockProvider,  TreeRoute, ImportRoute};

ethcore/src/client/evm_test_client.rs

@@ -18,7 +18,9 @@
 
 use std::fmt;
 use std::sync::Arc;
-use util::{self, U256, H256, journaldb, trie};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::{self, journaldb, trie};
 use util::kvdb::{self, KeyValueDB};
 use {state, state_db, client, executive, trace, transaction, db, spec, pod_state};
 use factory::Factories;
@@ -166,7 +168,7 @@ impl<'a> EvmTestClient<'a> {
 			author: *genesis.author(),
 			timestamp: genesis.timestamp(),
 			difficulty: *genesis.difficulty(),
-			last_hashes: Arc::new([util::H256::default(); 256].to_vec()),
+			last_hashes: Arc::new([H256::default(); 256].to_vec()),
 			gas_used: 0.into(),
 			gas_limit: *genesis.gas_limit(),
 		};

ethcore/src/client/test_client.rs

@@ -23,6 +23,8 @@ use std::mem;
 use itertools::Itertools;
 use rustc_hex::FromHex;
 use hash::keccak;
+use bigint::prelude::U256;
+use bigint::hash::{H256, H2048};
 use util::*;
 use rlp::*;
 use ethkey::{Generator, Random};

ethcore/src/client/trace.rs

@@ -1,7 +1,7 @@
 
 //! Bridge between Tracedb and Blockchain.
 
-use util::{H256};
+use bigint::hash::H256;
 use header::BlockNumber;
 use trace::DatabaseExtras as TraceDatabaseExtras;
 use blockchain::{BlockChain, BlockProvider};

ethcore/src/client/traits.rs

@@ -34,7 +34,9 @@ use trace::LocalizedTrace;
 use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction};
 use verification::queue::QueueInfo as BlockQueueInfo;
 
-use util::{U256, Address, H256, H2048, Bytes};
+use bigint::prelude::U256;
+use bigint::hash::{H256, H2048};
+use util::{Address, Bytes};
 use util::hashdb::DBValue;
 
 use types::ids::*;