Don't reexport bigint from util

parity/blockchain.rs

@@ -22,7 +22,9 @@ use std::thread::sleep;
 use std::sync::Arc;
 use rustc_hex::FromHex;
 use hash::{keccak, KECCAK_NULL_RLP};
-use util::{ToPretty, U256, H256, Address};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::{ToPretty, Address};
 use rlp::PayloadInfo;
 use ethcore::service::ClientService;
 use ethcore::client::{Mode, DatabaseCompactionProfile, VMType, BlockImportError, BlockChainClient, BlockId};

parity/configuration.rs

@@ -23,7 +23,9 @@ use std::cmp::max;
 use std::str::FromStr;
 use cli::{Args, ArgsError};
 use hash::keccak;
-use util::{H256, U256, Bytes, version_data, Address};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::{Bytes, version_data, Address};
 use util::journaldb::Algorithm;
 use util::Colour;
 use ethsync::{NetworkConfiguration, is_valid_node_url};

parity/dir.rs

@@ -16,7 +16,7 @@
 
 use std::fs;
 use std::path::{PathBuf, Path};
-use util::{H64, H256};
+use bigint::hash::{H64, H256};
 use util::journaldb::Algorithm;
 use helpers::{replace_home, replace_home_and_local};
 use app_dirs::{AppInfo, get_app_root, AppDataType};

parity/helpers.rs

@@ -18,7 +18,9 @@ use std::{io, env};
 use std::io::{Write, BufReader, BufRead};
 use std::time::Duration;
 use std::fs::File;
-use util::{clean_0x, U256, Address, CompactionProfile};
+use bigint::prelude::U256;
+use bigint::hash::clean_0x;
+use util::{Address, CompactionProfile};
 use util::journaldb::Algorithm;
 use ethcore::client::{Mode, BlockId, VMType, DatabaseCompactionProfile, ClientConfig, VerifierType};
 use ethcore::miner::{PendingSet, GasLimit, PrioritizationStrategy};
@@ -341,7 +343,7 @@ mod tests {
 	use std::fs::File;
 	use std::io::Write;
 	use devtools::RandomTempPath;
-	use util::{U256};
+	use bigint::prelude::U256;
 	use ethcore::client::{Mode, BlockId};
 	use ethcore::miner::PendingSet;
 	use super::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_address, to_addresses, to_price, geth_ipc_path, to_bootnodes, password_from_file};

parity/informant.rs

@@ -35,7 +35,8 @@ use light::client::LightChainClient;
 use number_prefix::{binary_prefix, Standalone, Prefixed};
 use parity_rpc::{is_major_importing};
 use parity_rpc::informant::RpcStats;
-use util::{RwLock, Mutex, H256, Colour, Bytes};
+use bigint::hash::H256;
+use util::{RwLock, Mutex, Colour, Bytes};
 
 /// Format byte counts to standard denominations.
 pub fn format_bytes(b: usize) -> String {

parity/main.rs

@@ -55,6 +55,7 @@ extern crate ethcore_ipc_nano as nanoipc;
 extern crate ethcore_light as light;
 extern crate ethcore_logger;
 extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate ethcore_network as network;
 extern crate ethkey;
 extern crate ethsync;

parity/params.rs

@@ -16,7 +16,8 @@
 
 use std::{str, fs, fmt, path};
 use std::time::Duration;
-use util::{Address, U256, version_data};
+use bigint::prelude::U256;
+use util::{Address, version_data};
 use util::journaldb::Algorithm;
 use ethcore::spec::Spec;
 use ethcore::ethereum;