bigint upgraded to version 3.0

dapps/Cargo.toml

@@ -17,7 +17,7 @@ parity-dapps-glue = "1.7"
 mime = "0.2"
 mime_guess = "1.6.1"
 rand = "0.3"
-rustc-serialize = "0.3"
+rustc-hex = "1.0"
 serde = "0.9"
 serde_derive = "0.9"
 serde_json = "0.9"

dapps/src/apps/fetcher/mod.rs

@@ -23,7 +23,7 @@ mod installers;
 use std::{fs, env};
 use std::path::PathBuf;
 use std::sync::Arc;
-use rustc_serialize::hex::FromHex;
+use rustc_hex::FromHex;
 use fetch::{Client as FetchClient, Fetch};
 use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
 use parity_reactor::Remote;

dapps/src/lib.rs

@@ -24,7 +24,7 @@ extern crate futures;
 extern crate linked_hash_map;
 extern crate mime_guess;
 extern crate rand;
-extern crate rustc_serialize;
+extern crate rustc_hex;
 extern crate serde;
 extern crate serde_json;
 extern crate time;

dapps/src/tests/fetch.rs

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use devtools::http_client;
-use rustc_serialize::hex::FromHex;
+use rustc_hex::FromHex;
 use tests::helpers::{
 	serve_with_registrar, serve_with_registrar_and_sync, serve_with_fetch,
 	serve_with_registrar_and_fetch, serve_with_registrar_and_fetch_and_threads,

dapps/src/tests/helpers/registrar.rs

@@ -17,7 +17,7 @@
 use std::str;
 use std::sync::Arc;
 use std::collections::HashMap;
-use rustc_serialize::hex::FromHex;
+use rustc_hex::FromHex;
 
 use hash_fetch::urlhint::ContractClient;
 use util::{Bytes, Address, Mutex, H256, ToPretty};

ethcore/Cargo.toml

@@ -46,6 +46,7 @@ num_cpus = "1.2"
 rand = "0.3"
 rlp = { path = "../util/rlp" }
 rust-crypto = "0.2.34"
+rustc-hex = "1.0"
 rustc-serialize = "0.3"
 semver = "0.6"
 stats = { path = "../util/stats" }

ethcore/src/blockchain/blockchain.rs

@@ -1460,7 +1460,7 @@ impl BlockChain {
 mod tests {
 	#![cfg_attr(feature="dev", allow(similar_names))]
 	use std::sync::Arc;
-	use rustc_serialize::hex::FromHex;
+	use rustc_hex::FromHex;
 	use util::kvdb::KeyValueDB;
 	use util::hash::*;
 	use util::sha3::Hashable;

ethcore/src/builtin.rs

@@ -500,7 +500,7 @@ mod tests {
 	use super::{Builtin, Linear, ethereum_builtin, Pricer, Modexp};
 	use ethjson;
 	use util::{U256, BytesRef};
-	use rustc_serialize::hex::FromHex;
+	use rustc_hex::FromHex;
 
 	#[test]
 	fn identity() {
@@ -524,7 +524,6 @@ mod tests {
 
 	#[test]
 	fn sha256() {
-		use rustc_serialize::hex::FromHex;
 		let f = ethereum_builtin("sha256");
 
 		let i = [0u8; 0];
@@ -548,7 +547,6 @@ mod tests {
 
 	#[test]
 	fn ripemd160() {
-		use rustc_serialize::hex::FromHex;
 		let f = ethereum_builtin("ripemd160");
 
 		let i = [0u8; 0];
@@ -568,7 +566,6 @@ mod tests {
 
 	#[test]
 	fn ecrecover() {
-		use rustc_serialize::hex::FromHex;
 		/*let k = KeyPair::from_secret(b"test".sha3()).unwrap();
 		let a: Address = From::from(k.public().sha3());
 		println!("Address: {}", a);
@@ -627,7 +624,6 @@ mod tests {
 
 	#[test]
 	fn modexp() {
-		use rustc_serialize::hex::FromHex;
 
 		let f = Builtin {
 			pricer: Box::new(Modexp { divisor: 20 }),
@@ -714,7 +710,6 @@ mod tests {
 
 	#[test]
 	fn bn128_add() {
-		use rustc_serialize::hex::FromHex;
 
 		let f = Builtin {
 			pricer: Box::new(Linear { base: 0, word: 0 }),
@@ -776,7 +771,6 @@ mod tests {
 
 	#[test]
 	fn bn128_mul() {
-		use rustc_serialize::hex::FromHex;
 
 		let f = Builtin {
 			pricer: Box::new(Linear { base: 0, word: 0 }),

ethcore/src/client/test_client.rs

@@ -17,6 +17,7 @@
 //! Test client.
 
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrder};
+use rustc_hex::FromHex;
 use util::*;
 use rlp::*;
 use ethkey::{Generator, Random};

ethcore/src/engines/tendermint/mod.rs

@@ -651,6 +651,7 @@ impl Engine for Tendermint {
 
 #[cfg(test)]
 mod tests {
+	use rustc_hex::FromHex;
 	use util::*;
 	use block::*;
 	use error::{Error, BlockError};

ethcore/src/engines/validator_set/contract.rs

@@ -126,6 +126,7 @@ impl ValidatorSet for ValidatorContract {
 
 #[cfg(test)]
 mod tests {
+	use rustc_hex::FromHex;
 	use util::*;
 	use rlp::encode;
 	use spec::Spec;

ethcore/src/engines/validator_set/safe_contract.rs

@@ -420,6 +420,7 @@ impl ValidatorSet for ValidatorSafeContract {
 
 #[cfg(test)]
 mod tests {
+	use rustc_hex::FromHex;
 	use util::*;
 	use types::ids::BlockId;
 	use spec::Spec;

ethcore/src/env_info.rs

@@ -76,8 +76,6 @@ impl From<ethjson::vm::Env> for EnvInfo {
 
 #[cfg(test)]
 mod tests {
-	extern crate rustc_serialize;
-
 	use std::str::FromStr;
 	use super::*;
 	use util::{U256, Address};

ethcore/src/evm/interpreter/shared_cache.rs

@@ -92,7 +92,7 @@ impl Default for SharedCache {
 
 #[test]
 fn test_find_jump_destinations() {
-	use util::FromHex;
+	use rustc_hex::FromHex;
 	// given
 	let code = "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b01600055".from_hex().unwrap();
 

ethcore/src/evm/tests.rs

@@ -14,12 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::fmt::Debug;
+use rustc_hex::FromHex;
 use util::*;
 use action_params::{ActionParams, ActionValue};
 use env_info::EnvInfo;
 use types::executed::CallType;
 use evm::{self, Ext, Schedule, Factory, GasLeft, VMType, ContractCreateResult, MessageCallResult, CreateContractAddress, ReturnData};
-use std::fmt::Debug;
 use tests::helpers::*;
 use types::transaction::SYSTEM_ADDRESS;
 use executive::Executive;

ethcore/src/executive.rs

@@ -578,9 +578,10 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 #[allow(dead_code)]
 mod tests {
 	use std::sync::Arc;
+	use rustc_hex::FromHex;
 	use ethkey::{Generator, Random};
 	use super::*;
-	use util::{H256, U256, U512, Address, FromHex, FromStr};
+	use util::{H256, U256, U512, Address, FromStr};
 	use util::bytes::BytesRef;
 	use action_params::{ActionParams, ActionValue};
 	use env_info::EnvInfo;