Refactor: Don't reexport bigint from util

Cargo.toml

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

dapps/Cargo.toml

@@ -31,6 +31,7 @@ jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "pa
 jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 
 ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
 fetch = { path = "../util/fetch" }
 node-health = { path = "./node-health" }
 parity-hash-fetch = { path = "../hash-fetch" }

dapps/src/apps/fetcher/installers.rs

@@ -20,7 +20,7 @@ use std::io::{self, Read, Write};
 use std::path::PathBuf;
 use fetch::{self, Mime};
 use hash::keccak_buffer;
-use util::H256;
+use bigint::hash::H256;
 
 use page::{LocalPageEndpoint, PageCache};
 use handlers::{ContentValidator, ValidatorResponse};

dapps/src/lib.rs

@@ -38,6 +38,7 @@ extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
 
 extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate fetch;
 extern crate node_health;
 extern crate parity_dapps_glue as parity_dapps;

dapps/src/tests/helpers/registrar.rs

@@ -20,8 +20,9 @@ use std::collections::HashMap;
 use rustc_hex::FromHex;
 
 use hash_fetch::urlhint::ContractClient;
+use bigint::hash::H256;
+use util::{Bytes, Address, ToPretty};
 use parking_lot::Mutex;
-use util::{Bytes, Address, H256, ToPretty};
 
 const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
 const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";

ethcore/Cargo.toml

@@ -30,6 +30,7 @@ ethcore-ipc-nano = { path = "../ipc/nano" }
 ethcore-logger = { path = "../logger" }
 ethcore-stratum = { path = "../stratum" }
 ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
 ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }

ethcore/evm/Cargo.toml

@@ -8,6 +8,7 @@ bit-set = "0.4"
 byteorder = "1.0"
 common-types = { path = "../types" }
 ethcore-util = { path = "../../util" }
+ethcore-bigint = { path = "../../util/bigint" }
 evmjit = { path = "../../evmjit", optional = true }
 ethjson = { path = "../../json" }
 heapsize = "0.4"

ethcore/evm/src/benches/mod.rs

@@ -24,6 +24,8 @@ extern crate test;
 
 use self::test::{Bencher, black_box};
 
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use util::*;
 use vm::ActionParams;
 use evm::{self, Factory, VMType};

ethcore/evm/src/evm.rs

@@ -17,7 +17,8 @@
 //! Evm interface.
 
 use std::{ops, cmp, fmt};
-use util::{U128, U256, U512};
+
+use bigint::prelude::{U128, U256, U512};
 use vm::{Ext, Result, ReturnData, GasLeft, Error};
 
 /// Finalization result. Gas Left: either it is a known value, or it needs to be computed by processing
@@ -149,7 +150,7 @@ impl CostType for usize {
 
 #[cfg(test)]
 mod tests {
-	use util::U256;
+	use bigint::prelude::U256;
 	use super::CostType;
 
 	#[test]

ethcore/evm/src/factory.rs

@@ -18,7 +18,7 @@
 //!
 use std::sync::Arc;
 use vm::Vm;
-use util::U256;
+use bigint::prelude::U256;
 use super::interpreter::SharedCache;
 use super::vmtype::VMType;
 

ethcore/evm/src/interpreter/gasometer.rs

@@ -15,7 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::cmp;
-use util::*;
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use super::u256_to_address;
 
 use {evm, vm};

ethcore/evm/src/interpreter/informant.rs

@@ -43,7 +43,7 @@ mod inner {
 	use evm::instructions::{Instruction, InstructionInfo, INSTRUCTIONS};
 	use evm::{CostType};
 
-	use util::U256;
+	use bigint::prelude::U256;
 
 	macro_rules! evm_debug {
 		($x: expr) => {

ethcore/evm/src/interpreter/memory.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::U256;
+use bigint::prelude::U256;
 use vm::ReturnData;
 
 const MAX_RETURN_WASTE_BYTES: usize = 16384;
@@ -134,7 +134,7 @@ impl Memory for Vec<u8> {
 
 #[cfg(test)]
 mod tests {
-	use util::U256;
+	use bigint::prelude::U256;
 	use super::Memory;
 
 	#[test]

ethcore/evm/src/interpreter/mod.rs

@@ -27,6 +27,8 @@ use std::marker::PhantomData;
 use std::{cmp, mem};
 use std::sync::Arc;
 use hash::keccak;
+use bigint::prelude::{U256, U512};
+use bigint::hash::H256;
 
 use vm::{
 	self, ActionParams, ActionValue, CallType, MessageCallResult,

ethcore/evm/src/interpreter/shared_cache.rs

@@ -17,8 +17,8 @@
 use std::sync::Arc;
 use hash::KECCAK_EMPTY;
 use heapsize::HeapSizeOf;
+use bigint::hash::H256;
 use parking_lot::Mutex;
-use util::H256;
 use util::cache::MemoryLruCache;
 use bit_set::BitSet;
 use super::super::instructions;

ethcore/evm/src/jit.rs

@@ -15,6 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Just in time compiler execution environment.
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use util::*;
 use evmjit;
 use evm::{self, GasLeft};

ethcore/evm/src/lib.rs

@@ -20,6 +20,7 @@ extern crate byteorder;
 extern crate bit_set;
 extern crate common_types as types;
 extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate ethjson;
 extern crate rlp;
 extern crate parity_wasm;

ethcore/evm/src/tests.rs

@@ -20,6 +20,8 @@ use std::hash::Hash;
 use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 use rustc_hex::FromHex;
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use util::*;
 use vm::{self, ActionParams, ActionValue};
 use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};

ethcore/light/Cargo.toml

@@ -14,6 +14,7 @@ build = "build.rs"
 log = "0.3"
 ethcore = { path = ".."}
 ethcore-util = { path = "../../util" }
+ethcore-bigint = { path = "../../util/bigint" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
 ethcore-ipc = { path = "../../ipc/rpc", optional = true }

ethcore/light/src/cache.rs

@@ -27,7 +27,8 @@ use ethcore::receipt::Receipt;
 use stats::Corpus;
 use time::{SteadyTime, Duration};
 use heapsize::HeapSizeOf;
-use util::{U256, H256};
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use util::cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.

ethcore/light/src/cht.rs

@@ -21,7 +21,9 @@
 //! we discarded.
 
 use ethcore::ids::BlockId;
-use util::{Bytes, H256, U256, HashDB, MemoryDB};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::{Bytes, HashDB, MemoryDB};
 use util::trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
 use rlp::{RlpStream, UntrustedRlp};
 

ethcore/light/src/client/fetch.rs

@@ -23,7 +23,7 @@ use ethcore::engines::{Engine, StateDependentProof};
 use ethcore::header::Header;
 use ethcore::receipt::Receipt;
 use futures::future::IntoFuture;
-use util::H256;
+use bigint::hash::H256;
 
 /// Provides full chain data.
 pub trait ChainDataFetcher: Send + Sync + 'static {

ethcore/light/src/client/header_chain.rs

@@ -43,7 +43,8 @@ use ethcore::engines::epoch::{
 
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
 use heapsize::HeapSizeOf;
-use util::{H256, H256FastMap, H264, U256};
+use bigint::prelude::U256;
+use bigint::hash::{H256, H256FastMap, H264};
 use util::kvdb::{DBTransaction, KeyValueDB};
 
 use cache::Cache;