Don't reexport bigint from util

ethcore/src/trace/db.rs

@@ -21,7 +21,8 @@ use std::sync::Arc;
 use bloomchain::{Number, Config as BloomConfig};
 use bloomchain::group::{BloomGroupDatabase, BloomGroupChain, GroupPosition, BloomGroup};
 use heapsize::HeapSizeOf;
-use util::{H256, H264, KeyValueDB, DBTransaction, RwLock};
+use bigint::hash::{H256, H264};
+use util::{KeyValueDB, DBTransaction, RwLock};
 use header::BlockNumber;
 use trace::{LocalizedTrace, Config, Filter, Database as TraceDatabase, ImportRequest, DatabaseExtras};
 use db::{self, Key, Writable, Readable, CacheUpdatePolicy};
@@ -411,7 +412,9 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
 mod tests {
 	use std::collections::HashMap;
 	use std::sync::Arc;
-	use util::{Address, U256, H256, DBTransaction};
+	use bigint::prelude::U256;
+	use bigint::hash::H256;
+	use util::{Address, DBTransaction};
 	use header::BlockNumber;
 	use trace::{Config, TraceDB, Database as TraceDatabase, DatabaseExtras, ImportRequest};
 	use trace::{Filter, LocalizedTrace, AddressesFilter, TraceError};

ethcore/src/trace/executive_tracer.rs

@@ -16,7 +16,8 @@
 
 //! Simple executive tracer.
 
-use util::{Bytes, Address, U256};
+use bigint::prelude::U256;
+use util::{Bytes, Address};
 use vm::ActionParams;
 use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide, Reward, RewardType};
 use trace::{Tracer, VMTracer, FlatTrace, TraceError};
@@ -158,7 +159,7 @@ impl Tracer for ExecutiveTracer {
 		debug!(target: "trace", "Traced suicide {:?}", trace);
 		self.traces.push(trace);
 	}
-	
+
 	fn trace_reward(&mut self, author: Address, value: U256, reward_type: RewardType) {
 		let trace = FlatTrace {
 			subtraces: 0,

ethcore/src/trace/import.rs

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Traces import request.
-use util::H256;
+use bigint::hash::H256;
 use header::BlockNumber;
 use trace::FlatBlockTraces;
 

ethcore/src/trace/mod.rs

@@ -37,7 +37,9 @@ pub use self::types::trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDi
 pub use self::types::flat::{FlatTrace, FlatTransactionTraces, FlatBlockTraces};
 pub use self::types::filter::{Filter, AddressesFilter};
 
-use util::{Bytes, Address, U256, H256, DBTransaction};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::{Bytes, Address, DBTransaction};
 use self::trace::{Call, Create};
 use vm::ActionParams;
 use header::BlockNumber;

ethcore/src/trace/noop_tracer.rs

@@ -16,7 +16,8 @@
 
 //! Nonoperative tracer.
 
-use util::{Bytes, Address, U256};
+use bigint::prelude::U256;
+use util::{Bytes, Address};
 use vm::ActionParams;
 use trace::{Tracer, VMTracer, FlatTrace, TraceError};
 use trace::trace::{Call, Create, VMTrace, RewardType};

ethcore/src/trace/types/localized.rs

@@ -16,7 +16,7 @@
 
 //! Localized traces type definitions
 
-use util::H256;
+use bigint::hash::H256;
 use super::trace::{Action, Res};
 use header::BlockNumber;
 

ethcore/src/trace/types/trace.rs

@@ -16,7 +16,8 @@
 
 //! Tracing datatypes.
 
-use util::{U256, Bytes, Address};
+use bigint::prelude::U256;
+use util::{Bytes, Address};
 use hash::keccak;
 use bloomable::Bloomable;
 use rlp::*;