Don't reexport bigint from util

evmbin/Cargo.toml

@@ -16,6 +16,7 @@ serde_derive = "1.0"
 ethcore = { path = "../ethcore" }
 ethjson = { path = "../json" }
 ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
 evm = { path = "../ethcore/evm" }
 vm = { path = "../ethcore/vm" }
 panic_hook = { path = "../panic_hook" }

evmbin/src/display/json.rs

@@ -18,7 +18,9 @@
 
 use ethcore::trace;
 use std::collections::HashMap;
-use util::{U256, H256, ToPretty};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::ToPretty;
 
 use display;
 use info as vm;

evmbin/src/display/mod.rs

@@ -17,7 +17,7 @@
 //! VM Output display utils.
 
 use std::time::Duration;
-use util::U256;
+use bigint::prelude::U256;
 
 pub mod json;
 pub mod simple;

evmbin/src/info.rs

@@ -17,7 +17,8 @@
 //! VM runner.
 
 use std::time::{Instant, Duration};
-use util::{U256, H256};
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use ethcore::{trace, spec, transaction, pod_state};
 use ethcore::client::{self, EvmTestClient, EvmTestError, TransactResult};
 use ethjson;

evmbin/src/main.rs

@@ -26,6 +26,7 @@ extern crate serde;
 extern crate serde_derive;
 extern crate docopt;
 extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate vm;
 extern crate evm;
 extern crate panic_hook;
@@ -35,7 +36,8 @@ use std::{fmt, fs};
 use std::path::PathBuf;
 use docopt::Docopt;
 use rustc_hex::FromHex;
-use util::{U256, Bytes, Address};
+use bigint::prelude::U256;
+use util::{Bytes, Address};
 use ethcore::spec;
 use vm::{ActionParams, CallType};