[ethcore]: move client test types to test-helpers (#11062)

rpc/src/v1/tests/helpers/miner_service.rs

@@ -23,8 +23,9 @@ use bytes::Bytes;
 use client_traits::{Nonce, StateClient};
 use engine::{Engine, signer::EngineSigner};
 use ethcore::block::SealedBlock;
-use ethcore::client::{PrepareOpenBlock, EngineInfo, TestState};
+use ethcore::client::{PrepareOpenBlock, EngineInfo};
 use ethcore::miner::{self, MinerService, AuthoringParams, FilterOptions};
+use ethcore::test_helpers::TestState;
 use ethereum_types::{H256, U256, Address};
 use miner::pool::local_transactions::Status as LocalTransactionStatus;
 use miner::pool::{verifier, VerifiedTransaction, QueueStatus};

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

@@ -16,7 +16,7 @@
 
 use std::sync::Arc;
 
-use ethcore::client::TestBlockChainClient;
+use ethcore::test_helpers::TestBlockChainClient;
 
 use jsonrpc_core::IoHandler;
 use v1::{Debug, DebugClient};

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

@@ -21,7 +21,7 @@ use std::time::{Instant, Duration, SystemTime, UNIX_EPOCH};
 
 use accounts::AccountProvider;
 use client_traits::BlockChainClient;
-use ethcore::client::{EachBlockWith, TestBlockChainClient};
+use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient};
 use ethcore::miner::{self, MinerService};
 use ethereum_types::{H160, H256, U256, Address, Bloom};
 use machine::executed::Executed;

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

@@ -23,7 +23,7 @@ use jsonrpc_pubsub::Session;
 use std::time::Duration;
 
 use v1::{EthPubSub, EthPubSubClient, Metadata};
-use ethcore::client::{TestBlockChainClient, EachBlockWith};
+use ethcore::test_helpers::{TestBlockChainClient, EachBlockWith};
 use parity_runtime::Runtime;
 use ethereum_types::{Address, H256};
 use client_traits::{BlockInfo, ChainNotify};

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

@@ -15,7 +15,7 @@
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use ethcore::client::TestBlockChainClient;
+use ethcore::test_helpers::TestBlockChainClient;
 use ethcore_logger::RotatingLogger;
 use ethereum_types::{Address, U256, H256, BigEndianHash, Bloom};
 use ethstore::ethkey::{Generator, Random};

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

@@ -20,7 +20,7 @@ use rustc_hex::FromHex;
 use ethereum_types::{U256, Address};
 
 use ethcore::miner::MinerService;
-use ethcore::client::TestBlockChainClient;
+use ethcore::test_helpers::TestBlockChainClient;
 use sync::ManageNetwork;
 
 use jsonrpc_core::IoHandler;

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

@@ -20,7 +20,7 @@ use std::str::FromStr;
 use bytes::ToPretty;
 use accounts::AccountProvider;
 use ethereum_types::{Address, H520, U256};
-use ethcore::client::TestBlockChainClient;
+use ethcore::test_helpers::TestBlockChainClient;
 use jsonrpc_core::IoHandler;
 use parking_lot::Mutex;
 use types::transaction::{Action, Transaction};

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

@@ -20,7 +20,7 @@ use ethereum_types::{H520, U256, Address};
 use bytes::ToPretty;
 
 use accounts::AccountProvider;
-use ethcore::client::TestBlockChainClient;
+use ethcore::test_helpers::TestBlockChainClient;
 use parity_runtime::Runtime;
 use parking_lot::Mutex;
 use rlp::encode;

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

@@ -33,14 +33,14 @@ use v1::tests::mocked::parity;
 
 use accounts::AccountProvider;
 use bytes::ToPretty;
+use ethcore::test_helpers::TestBlockChainClient;
 use ethereum_types::{U256, Address, Signature, H256};
-use ethcore::client::TestBlockChainClient;
 use ethkey::Secret;
 use ethstore::ethkey::{Generator, Random};
+use parity_runtime::{Runtime, Executor};
 use parking_lot::Mutex;
 use serde_json;
 use types::transaction::{Transaction, Action, SignedTransaction};
-use parity_runtime::{Runtime, Executor};
 
 struct SigningTester {
 	pub runtime: Runtime,

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

@@ -18,7 +18,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use accounts::AccountProvider;
-use ethcore::client::TestBlockChainClient;
+use ethcore::test_helpers::TestBlockChainClient;
 use ethereum_types::{U256, Address};
 use parity_runtime::Runtime;
 use parking_lot::Mutex;
@@ -30,7 +30,7 @@ use jsonrpc_core::IoHandler;
 use v1::{EthClientOptions, EthSigning, SigningUnsafeClient};
 use v1::helpers::nonce;
 use v1::helpers::dispatch::{self, FullDispatcher};
-use v1::tests::helpers::{TestMinerService};
+use v1::tests::helpers::TestMinerService;
 use v1::metadata::Metadata;
 
 fn blockchain_client() -> Arc<TestBlockChainClient> {

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

@@ -19,7 +19,7 @@ use std::sync::Arc;
 use machine::executed::Executed;
 use trace::trace::{Action, Res, Call};
 use trace::LocalizedTrace;
-use ethcore::client::TestBlockChainClient;
+use ethcore::test_helpers::TestBlockChainClient;
 use ethereum_types::{Address, H256};
 
 use types::transaction::CallError;