cleaning up hash reexports

rpc/src/v1/impls/eth.rs

@@ -27,7 +27,7 @@ use std::ops::Deref;
 use ethsync::{SyncProvider, SyncState};
 use ethcore::miner::{MinerService, ExternalMinerService};
 use jsonrpc_core::*;
-use util::numbers::*;
+use util::{H256, Address, FixedHash, U256, H64, Uint};
 use util::sha3::*;
 use util::rlp::{encode, decode, UntrustedRlp, View};
 use util::{FromHex, Mutex};

rpc/src/v1/impls/mod.rs

@@ -60,7 +60,7 @@ use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::transaction::{Action, SignedTransaction, Transaction};
 use ethcore::account_provider::{AccountProvider, Error as AccountError};
-use util::numbers::*;
+use util::{U256, H256, Address};
 use util::rlp::encode;
 use util::bytes::ToPretty;
 use jsonrpc_core::{Error, ErrorCode, Value, to_value};
@@ -100,13 +100,13 @@ fn prepare_transaction<C, M>(client: &C, miner: &M, request: TransactionRequest)
 		nonce: request.nonce
 			.or_else(|| miner
 					 .last_nonce(&request.from)
-					 .map(|nonce| nonce + U256::one()))
+					 .map(|nonce| nonce + 1.into()))
 			.unwrap_or_else(|| client.latest_nonce(&request.from)),
 
 		action: request.to.map_or(Action::Create, Action::Call),
 		gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
 		gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(client, miner)),
-		value: request.value.unwrap_or_else(U256::zero),
+		value: request.value.unwrap_or_else(Default::default),
 		data: request.data.map_or_else(Vec::new, |b| b.to_vec()),
 	}
 }

rpc/src/v1/tests/mocked/eth.rs

@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::time::{Instant, Duration};
 use jsonrpc_core::IoHandler;
 use util::hash::{Address, H256, FixedHash};
-use util::numbers::{Uint, U256};
+use util::{Uint, U256};
 use util::Mutex;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::{TestBlockChainClient, EachBlockWith, Executed, TransactionID};

rpc/src/v1/tests/mocked/eth_signing.rs

@@ -22,8 +22,7 @@ use v1::impls::EthSigningQueueClient;
 use v1::traits::EthSigning;
 use v1::helpers::{ConfirmationsQueue, SigningQueue};
 use v1::tests::helpers::TestMinerService;
-use util::{Address, FixedHash};
-use util::numbers::{Uint, U256, H256};
+use util::{Address, FixedHash, Uint, U256, H256};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
 use ethcore::transaction::{Transaction, Action};

rpc/src/v1/tests/mocked/ethcore_set.rs

@@ -21,7 +21,7 @@ use v1::{EthcoreSet, EthcoreSetClient};
 use ethcore::miner::MinerService;
 use ethcore::client::TestBlockChainClient;
 use v1::tests::helpers::TestMinerService;
-use util::numbers::*;
+use util::{U256, Address};
 use rustc_serialize::hex::FromHex;
 use super::manage_network::TestManageNetwork;
 use ethsync::ManageNetwork;

rpc/src/v1/tests/mocked/net.rs

@@ -18,11 +18,10 @@ use std::sync::Arc;
 use jsonrpc_core::IoHandler;
 use v1::{Net, NetClient};
 use v1::tests::helpers::{Config, TestSyncProvider};
-use util::numbers::*;
 
 fn sync_provider() -> Arc<TestSyncProvider> {
 	Arc::new(TestSyncProvider::new(Config {
-		network_id: U256::from(3),
+		network_id: 3.into(),
 		num_peers: 120,
 	}))
 }

rpc/src/v1/tests/mocked/personal.rs

@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use std::str::FromStr;
 use jsonrpc_core::IoHandler;
-use util::numbers::*;
+use util::{U256, Uint, Address};
 use ethcore::account_provider::AccountProvider;
 use v1::{PersonalClient, Personal};
 use v1::tests::helpers::TestMinerService;

rpc/src/v1/tests/mocked/personal_signer.rs

@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use std::str::FromStr;
 use jsonrpc_core::IoHandler;
-use util::numbers::*;
+use util::{U256, Uint, Address};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
 use ethcore::transaction::{Transaction, Action};