Merge branch 'fo-6418-dont-export-bigint' of github.com:paritytech/parity into util_error_chain

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/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/types/request/mod.rs

@@ -1540,7 +1540,8 @@ pub mod execution {
 pub mod epoch_signal {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use util::{Bytes, H256};
+	use bigint::hash::H256;
+	use util::Bytes;
 
 	/// Potentially incomplete epoch signal request.
 	#[derive(Debug, Clone, PartialEq, Eq)]

evmbin/benches/mod.rs

@@ -26,13 +26,14 @@ extern crate test;
 extern crate ethcore;
 extern crate evm;
 extern crate ethcore_util;
+extern crate ethcore_bigint;
 extern crate rustc_hex;
 
 use self::test::{Bencher, black_box};
 
 use evm::run_vm;
 use ethcore::vm::ActionParams;
-use ethcore_util::U256;
+use ethcore_bigint::prelude::U256;
 use rustc_hex::FromHex;
 
 #[bench]

parity/light_helpers/epoch_fetch.rs

@@ -28,7 +28,7 @@ use light::client::fetch::ChainDataFetcher;
 use light::on_demand::{request, OnDemand};
 
 use parking_lot::RwLock;
-use util::H256;
+use bigint::hash::H256;
 
 const ALL_VALID_BACKREFS: &str = "no back-references, therefore all back-references valid; qed";