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/vm/Cargo.toml

@@ -5,9 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 byteorder = "1.0"
-ethcore-util = { path = "../../util" }
 ethcore-bytes = { path = "../../util/bytes" }
-ethcore-bigint = { path = "../../util/bigint" }
+ethereum-types = "0.1"
 patricia-trie = { path = "../../util/patricia_trie" }
 log = "0.3"
 common-types = { path = "../types" }

ethcore/vm/src/action_params.rs

@@ -15,9 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Evm input params.
-use bigint::prelude::U256;
-use bigint::hash::{H256};
-use util::Address;
+use ethereum_types::{U256, H256, Address};
 use bytes::Bytes;
 use hash::{keccak, KECCAK_EMPTY};
 use ethjson;

ethcore/vm/src/env_info.rs

@@ -19,9 +19,7 @@
 use std::cmp;
 use std::sync::Arc;
 use hash::keccak;
-use bigint::hash::H256;
-use bigint::prelude::U256;
-use util::Address;
+use ethereum_types::{U256, H256, Address};
 use types::BlockNumber;
 use ethjson;
 
@@ -81,8 +79,7 @@ impl From<ethjson::vm::Env> for EnvInfo {
 mod tests {
 	use std::str::FromStr;
 	use super::*;
-	use bigint::prelude::U256;
-	use util::Address;
+	use ethereum_types::{U256, Address};
 	use ethjson;
 
 	#[test]

ethcore/vm/src/ext.rs

@@ -17,9 +17,7 @@
 //! Interface for Evm externalities.
 
 use std::sync::Arc;
-use bigint::prelude::U256;
-use bigint::hash::H256;
-use util::*;
+use ethereum_types::{U256, H256, Address};
 use bytes::Bytes;
 use call_type::CallType;
 use env_info::EnvInfo;

ethcore/vm/src/lib.rs

@@ -16,8 +16,7 @@
 
 //! Virtual machines support library
 
-extern crate ethcore_util as util;
-extern crate ethcore_bigint as bigint;
+extern crate ethereum_types;
 extern crate ethcore_bytes as bytes;
 extern crate common_types as types;
 extern crate ethjson;

ethcore/vm/src/return_data.rs

@@ -14,7 +14,7 @@
 
 //! Return data structures
 
-use bigint::prelude::U256;
+use ethereum_types::U256;
 
 /// Return data buffer. Holds memory from a previous call and a slice into that memory.
 #[derive(Debug)]

ethcore/vm/src/tests.rs

@@ -17,9 +17,7 @@
 use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 
-use bigint::prelude::U256;
-use bigint::hash::H256;
-use util::Address;
+use ethereum_types::{U256, H256, Address};
 use bytes::Bytes;
 use {
 	CallType, Schedule, EnvInfo,