dissolve util (#7460)

* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor finished

* removed obsolete util/src/lib.rs

* removed commented out code

ethcore/evm/src/evm.rs

@@ -17,7 +17,7 @@
 //! Evm interface.
 
 use std::{ops, cmp, fmt};
-use bigint::prelude::{U128, U256, U512};
+use ethereum_types::{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 +149,7 @@ impl CostType for usize {
 
 #[cfg(test)]
 mod tests {
-	use bigint::prelude::U256;
+	use ethereum_types::U256;
 	use super::CostType;
 
 	#[test]

ethcore/evm/src/factory.rs

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

ethcore/evm/src/interpreter/gasometer.rs

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

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 bigint::prelude::U256;
+use ethereum_types::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 bigint::prelude::U256;
+	use ethereum_types::U256;
 	use super::Memory;
 
 	#[test]

ethcore/evm/src/interpreter/mod.rs

@@ -27,8 +27,7 @@ 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 ethereum_types::{U256, U512, H256, Address};
 
 use vm::{
 	self, ActionParams, ActionValue, CallType, MessageCallResult,
@@ -45,8 +44,6 @@ pub use self::shared_cache::SharedCache;
 
 use bit_set::BitSet;
 
-use util::*;
-
 type ProgramCounter = usize;
 
 const ONE: U256 = U256([1, 0, 0, 0]);

ethcore/evm/src/interpreter/shared_cache.rs

@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use hash::KECCAK_EMPTY;
 use heapsize::HeapSizeOf;
-use bigint::hash::H256;
+use ethereum_types::H256;
 use parking_lot::Mutex;
 use memory_cache::MemoryLruCache;
 use bit_set::BitSet;

ethcore/evm/src/lib.rs

@@ -17,8 +17,7 @@
 //! Ethereum virtual machine.
 
 extern crate bit_set;
-extern crate ethcore_util as util;
-extern crate ethcore_bigint as bigint;
+extern crate ethereum_types;
 extern crate parking_lot;
 extern crate heapsize;
 extern crate vm;

ethcore/evm/src/tests.rs

@@ -20,9 +20,7 @@ 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 ethereum_types::{U256, H256, Address};
 use vm::{self, ActionParams, ActionValue};
 use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
 use factory::Factory;