From b6415c61963bb1d415ff0e173a78cdb8d2c65fa0 Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Tue, 17 Sep 2019 16:42:22 +0200 Subject: [PATCH] [ethcore]: move client test types to test-helpers (#11062) --- ethcore/light/src/net/tests/mod.rs | 2 +- ethcore/light/src/on_demand/request.rs | 2 +- ethcore/light/src/provider.rs | 2 +- ethcore/src/client/mod.rs | 10 ---------- ethcore/src/json_tests/chain.rs | 4 ++-- ethcore/src/json_tests/state.rs | 2 +- ethcore/src/json_tests/transaction.rs | 2 +- ethcore/src/miner/miner.rs | 6 ++++-- .../{client => test_helpers}/evm_test_client.rs | 0 .../src/{test_helpers.rs => test_helpers/mod.rs} | 16 ++++++++++++---- .../src/{client => test_helpers}/test_client.rs | 0 ethcore/sync/src/block_sync.rs | 8 ++++---- ethcore/sync/src/blocks.rs | 2 +- ethcore/sync/src/chain/handler.rs | 6 +++--- ethcore/sync/src/chain/mod.rs | 4 ++-- ethcore/sync/src/chain/propagator.rs | 2 +- ethcore/sync/src/chain/supplier.rs | 8 ++++---- ethcore/sync/src/light_sync/tests/mod.rs | 2 +- ethcore/sync/src/light_sync/tests/test_net.rs | 2 +- ethcore/sync/src/tests/chain.rs | 2 +- ethcore/sync/src/tests/helpers.rs | 7 +++---- ethcore/sync/src/tests/snapshot.rs | 2 +- ethcore/verification/benches/verification.rs | 2 +- ethcore/verification/src/verification.rs | 5 ++--- evmbin/src/info.rs | 5 +---- ipfs/src/route.rs | 2 +- rpc/src/v1/tests/helpers/miner_service.rs | 3 ++- rpc/src/v1/tests/mocked/debug.rs | 2 +- rpc/src/v1/tests/mocked/eth.rs | 2 +- rpc/src/v1/tests/mocked/eth_pubsub.rs | 2 +- rpc/src/v1/tests/mocked/parity.rs | 2 +- rpc/src/v1/tests/mocked/parity_set.rs | 2 +- rpc/src/v1/tests/mocked/personal.rs | 2 +- rpc/src/v1/tests/mocked/signer.rs | 2 +- rpc/src/v1/tests/mocked/signing.rs | 4 ++-- rpc/src/v1/tests/mocked/signing_unsafe.rs | 4 ++-- rpc/src/v1/tests/mocked/traces.rs | 2 +- updater/src/updater.rs | 2 +- 38 files changed, 65 insertions(+), 69 deletions(-) rename ethcore/src/{client => test_helpers}/evm_test_client.rs (100%) rename ethcore/src/{test_helpers.rs => test_helpers/mod.rs} (98%) rename ethcore/src/{client => test_helpers}/test_client.rs (100%) diff --git a/ethcore/light/src/net/tests/mod.rs b/ethcore/light/src/net/tests/mod.rs index 70d6bbbd4..c5856ce8e 100644 --- a/ethcore/light/src/net/tests/mod.rs +++ b/ethcore/light/src/net/tests/mod.rs @@ -21,7 +21,7 @@ use common_types::blockchain_info::BlockChainInfo; use common_types::encoded; use common_types::ids::BlockId; use common_types::transaction::{Action, PendingTransaction}; -use ethcore::client::{EachBlockWith, TestBlockChainClient}; +use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient}; use ethereum_types::{H256, U256, Address, BigEndianHash}; use net::context::IoContext; use net::load_timer::MOVING_SAMPLE_SIZE; diff --git a/ethcore/light/src/on_demand/request.rs b/ethcore/light/src/on_demand/request.rs index 94af245eb..d59960287 100644 --- a/ethcore/light/src/on_demand/request.rs +++ b/ethcore/light/src/on_demand/request.rs @@ -1099,7 +1099,7 @@ mod tests { use trie::Recorder; use hash::keccak; - use ethcore::client::{TestBlockChainClient, EachBlockWith}; + use ethcore::test_helpers::{TestBlockChainClient, EachBlockWith}; use client_traits::{BlockInfo, BlockChainClient}; use common_types::header::Header; use common_types::encoded; diff --git a/ethcore/light/src/provider.rs b/ethcore/light/src/provider.rs index c44bf59b3..be3095567 100644 --- a/ethcore/light/src/provider.rs +++ b/ethcore/light/src/provider.rs @@ -396,7 +396,7 @@ impl AsLightClient for LightProvider { #[cfg(test)] mod tests { - use ethcore::client::{EachBlockWith, TestBlockChainClient}; + use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient}; use super::Provider; #[test] diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs index 8314adc8e..619121674 100644 --- a/ethcore/src/client/mod.rs +++ b/ethcore/src/client/mod.rs @@ -22,19 +22,9 @@ mod client; mod config; mod traits; -#[cfg(any(test, feature = "test-helpers"))] -mod evm_test_client; -#[cfg(any(test, feature = "test-helpers"))] -mod test_client; - pub use self::client::Client; pub use self::config::{ClientConfig, DatabaseCompactionProfile, VMType}; pub use self::traits::{ ReopenBlock, PrepareOpenBlock, ImportSealedBlock, BroadcastProposalBlock, Call, EngineInfo, BlockProducer, SealedBlockImporter, }; - -#[cfg(any(test, feature = "test-helpers"))] -pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess}; -#[cfg(any(test, feature = "test-helpers"))] -pub use self::test_client::{TestBlockChainClient, EachBlockWith, TestState}; diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs index 352379dea..4a965f705 100644 --- a/ethcore/src/json_tests/chain.rs +++ b/ethcore/src/json_tests/chain.rs @@ -16,13 +16,13 @@ use std::path::Path; use std::sync::Arc; -use client::{EvmTestClient, Client, ClientConfig}; +use client::{Client, ClientConfig}; use client_traits::{ImportBlock, ChainInfo}; use spec::Genesis; use ethjson; use miner::Miner; use io::IoChannel; -use test_helpers; +use test_helpers::{self, EvmTestClient}; use types::verification::Unverified; use verification::VerifierType; use super::SKIP_TEST_STATE; diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs index 24a001b8a..abd00a882 100644 --- a/ethcore/src/json_tests/state.rs +++ b/ethcore/src/json_tests/state.rs @@ -18,8 +18,8 @@ use std::path::Path; use super::test_common::*; use pod::PodState; use trace; -use client::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess}; use ethjson; +use test_helpers::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess}; use types::transaction::SignedTransaction; use vm::EnvInfo; use super::SKIP_TEST_STATE; diff --git a/ethcore/src/json_tests/transaction.rs b/ethcore/src/json_tests/transaction.rs index 19bd428e9..73590afc0 100644 --- a/ethcore/src/json_tests/transaction.rs +++ b/ethcore/src/json_tests/transaction.rs @@ -16,7 +16,7 @@ use std::path::Path; use super::test_common::*; -use client::EvmTestClient; +use test_helpers::EvmTestClient; use ethjson; use rlp::Rlp; use types::{ diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs index 5c15d7379..b6a70d231 100644 --- a/ethcore/src/miner/miner.rs +++ b/ethcore/src/miner/miner.rs @@ -1491,10 +1491,12 @@ mod tests { use hash::keccak; use rustc_hex::FromHex; - use client::{TestBlockChainClient, EachBlockWith, ImportSealedBlock}; use client_traits::ChainInfo; + use client::ImportSealedBlock; use miner::{MinerService, PendingOrdering}; - use test_helpers::{generate_dummy_client, generate_dummy_client_with_spec}; + use test_helpers::{ + generate_dummy_client, generate_dummy_client_with_spec, TestBlockChainClient, EachBlockWith + }; use types::{ BlockNumber, transaction::Transaction diff --git a/ethcore/src/client/evm_test_client.rs b/ethcore/src/test_helpers/evm_test_client.rs similarity index 100% rename from ethcore/src/client/evm_test_client.rs rename to ethcore/src/test_helpers/evm_test_client.rs diff --git a/ethcore/src/test_helpers.rs b/ethcore/src/test_helpers/mod.rs similarity index 98% rename from ethcore/src/test_helpers.rs rename to ethcore/src/test_helpers/mod.rs index f088670ce..44b298cdb 100644 --- a/ethcore/src/test_helpers.rs +++ b/ethcore/src/test_helpers/mod.rs @@ -16,6 +16,18 @@ //! Set of different helpers for client tests +mod test_client; +mod evm_test_client; + +/// Re-export for tests only +pub use evm::CreateContractAddress; +/// Re-export for tests only +pub use trie::TrieSpec; +/// Re-export for tests only +pub use self::test_client::{TestBlockChainClient, EachBlockWith, TestState}; +/// Re-export for tests only +pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess}; + use std::path::Path; use std::sync::Arc; use std::{fs, io}; @@ -53,10 +65,6 @@ use spec::{Spec, self}; use account_state::*; use state_db::StateDB; -/// Re-export for tests only -pub use evm::CreateContractAddress; -/// Re-export for tests only -pub use trie::TrieSpec; /// Creates test block with corresponding header pub fn create_test_block(header: &Header) -> Bytes { diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/test_helpers/test_client.rs similarity index 100% rename from ethcore/src/client/test_client.rs rename to ethcore/src/test_helpers/test_client.rs diff --git a/ethcore/sync/src/block_sync.rs b/ethcore/sync/src/block_sync.rs index bdc9864c9..a505e63cd 100644 --- a/ethcore/sync/src/block_sync.rs +++ b/ethcore/sync/src/block_sync.rs @@ -636,15 +636,15 @@ fn all_expected(values: &[A], expected_values: &[B], is_expected: F) -> #[cfg(test)] mod tests { use super::*; - use ethcore::client::TestBlockChainClient; + use ethcore::test_helpers::TestBlockChainClient; use spec; - use ethkey::{Generator,Random}; + use ethkey::{Generator, Random}; use hash::keccak; use parking_lot::RwLock; - use rlp::{encode_list,RlpStream}; + use rlp::{encode_list, RlpStream}; use tests::helpers::TestIo; use tests::snapshot::TestSnapshotService; - use types::transaction::{Transaction,SignedTransaction}; + use types::transaction::{Transaction, SignedTransaction}; use triehash_ethereum::ordered_trie_root; use types::header::Header as BlockHeader; diff --git a/ethcore/sync/src/blocks.rs b/ethcore/sync/src/blocks.rs index 0dd672786..2db1fd1f3 100644 --- a/ethcore/sync/src/blocks.rs +++ b/ethcore/sync/src/blocks.rs @@ -544,7 +544,7 @@ impl BlockCollection { mod test { use super::{BlockCollection, SyncHeader}; use client_traits::BlockChainClient; - use ethcore::client::{TestBlockChainClient, EachBlockWith}; + use ethcore::test_helpers::{TestBlockChainClient, EachBlockWith}; use types::{ ids::BlockId, BlockNumber, diff --git a/ethcore/sync/src/chain/handler.rs b/ethcore/sync/src/chain/handler.rs index 8c0ab8741..3775189e4 100644 --- a/ethcore/sync/src/chain/handler.rs +++ b/ethcore/sync/src/chain/handler.rs @@ -801,11 +801,11 @@ impl SyncHandler { #[cfg(test)] mod tests { use client_traits::ChainInfo; - use ethcore::client::{EachBlockWith, TestBlockChainClient}; + use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient}; use parking_lot::RwLock; use rlp::Rlp; - use std::collections::{VecDeque}; - use tests::helpers::{TestIo}; + use std::collections::VecDeque; + use tests::helpers::TestIo; use tests::snapshot::TestSnapshotService; use super::*; diff --git a/ethcore/sync/src/chain/mod.rs b/ethcore/sync/src/chain/mod.rs index 9467d0831..cd2255d49 100644 --- a/ethcore/sync/src/chain/mod.rs +++ b/ethcore/sync/src/chain/mod.rs @@ -1408,7 +1408,7 @@ pub mod tests { use std::collections::{VecDeque}; use ethkey; use network::PeerId; - use tests::helpers::{TestIo}; + use tests::helpers::TestIo; use tests::snapshot::TestSnapshotService; use ethereum_types::{H256, U256, Address}; use parking_lot::RwLock; @@ -1417,7 +1417,7 @@ pub mod tests { use super::*; use ::SyncConfig; use super::{PeerInfo, PeerAsking}; - use ethcore::client::{EachBlockWith, TestBlockChainClient}; + use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient}; use client_traits::{BlockInfo, BlockChainClient, ChainInfo}; use ethcore::miner::{MinerService, PendingOrdering}; use types::header::Header; diff --git a/ethcore/sync/src/chain/propagator.rs b/ethcore/sync/src/chain/propagator.rs index 1afb5e92b..07856e1f0 100644 --- a/ethcore/sync/src/chain/propagator.rs +++ b/ethcore/sync/src/chain/propagator.rs @@ -336,7 +336,7 @@ impl SyncPropagator { #[cfg(test)] mod tests { use client_traits::{BlockInfo, ChainInfo}; - use ethcore::client::{EachBlockWith, TestBlockChainClient}; + use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient}; use parking_lot::RwLock; use rlp::Rlp; use std::collections::VecDeque; diff --git a/ethcore/sync/src/chain/supplier.rs b/ethcore/sync/src/chain/supplier.rs index fe09766bf..f9ea49dd0 100644 --- a/ethcore/sync/src/chain/supplier.rs +++ b/ethcore/sync/src/chain/supplier.rs @@ -394,17 +394,17 @@ impl SyncSupplier { #[cfg(test)] mod test { - use std::collections::{VecDeque}; - use tests::helpers::{TestIo}; + use std::collections::VecDeque; + use tests::helpers::TestIo; use tests::snapshot::TestSnapshotService; - use ethereum_types::{H256}; + use ethereum_types::H256; use parking_lot::RwLock; use bytes::Bytes; use rlp::{Rlp, RlpStream}; use super::{*, super::tests::*}; use blocks::SyncHeader; use client_traits::BlockChainClient; - use ethcore::client::{EachBlockWith, TestBlockChainClient}; + use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient}; use std::str::FromStr; #[test] diff --git a/ethcore/sync/src/light_sync/tests/mod.rs b/ethcore/sync/src/light_sync/tests/mod.rs index 22f775695..406f6ccb9 100644 --- a/ethcore/sync/src/light_sync/tests/mod.rs +++ b/ethcore/sync/src/light_sync/tests/mod.rs @@ -16,7 +16,7 @@ use tests::helpers::TestNet; -use ethcore::client::EachBlockWith; +use ethcore::test_helpers::EachBlockWith; use client_traits::BlockInfo; use types::ids::BlockId; diff --git a/ethcore/sync/src/light_sync/tests/test_net.rs b/ethcore/sync/src/light_sync/tests/test_net.rs index eb35b8905..6eabda2bd 100644 --- a/ethcore/sync/src/light_sync/tests/test_net.rs +++ b/ethcore/sync/src/light_sync/tests/test_net.rs @@ -22,7 +22,7 @@ use std::sync::Arc; use light_sync::*; use tests::helpers::{TestNet, Peer as PeerLike, TestPacket}; -use ethcore::client::TestBlockChainClient; +use ethcore::test_helpers::TestBlockChainClient; use spec; use io::IoChannel; use kvdb_memorydb; diff --git a/ethcore/sync/src/tests/chain.rs b/ethcore/sync/src/tests/chain.rs index c01c96a03..8a47f0054 100644 --- a/ethcore/sync/src/tests/chain.rs +++ b/ethcore/sync/src/tests/chain.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use types::ids::BlockId; use client_traits::{BlockChainClient, ChainInfo}; -use ethcore::client::{TestBlockChainClient, EachBlockWith}; +use ethcore::test_helpers::{TestBlockChainClient, EachBlockWith}; use client_traits::BlockInfo; use chain::SyncState; use super::helpers::*; diff --git a/ethcore/sync/src/tests/helpers.rs b/ethcore/sync/src/tests/helpers.rs index 938569f56..515a777c5 100644 --- a/ethcore/sync/src/tests/helpers.rs +++ b/ethcore/sync/src/tests/helpers.rs @@ -27,10 +27,9 @@ use types::{ io_message::ClientIoMessage, }; use client_traits::{BlockChainClient, ChainNotify}; -use ethcore::client::{ - TestBlockChainClient, - Client as EthcoreClient, - ClientConfig, +use ethcore::{ + client::{Client as EthcoreClient, ClientConfig}, + test_helpers::TestBlockChainClient }; use snapshot::SnapshotService; use spec::{self, Spec}; diff --git a/ethcore/sync/src/tests/snapshot.rs b/ethcore/sync/src/tests/snapshot.rs index 8152bc69c..deeb8dcf6 100644 --- a/ethcore/sync/src/tests/snapshot.rs +++ b/ethcore/sync/src/tests/snapshot.rs @@ -21,7 +21,7 @@ use ethereum_types::H256; use parking_lot::Mutex; use bytes::Bytes; use snapshot::SnapshotService; -use ethcore::client::EachBlockWith; +use ethcore::test_helpers::EachBlockWith; use types::{ BlockNumber, snapshot::{ManifestData, RestorationStatus}, diff --git a/ethcore/verification/benches/verification.rs b/ethcore/verification/benches/verification.rs index fa4992b00..36722af6e 100644 --- a/ethcore/verification/benches/verification.rs +++ b/ethcore/verification/benches/verification.rs @@ -22,7 +22,7 @@ use common_types::verification::Unverified; use criterion::{Criterion, criterion_group, criterion_main}; use ethash::{EthashParams, Ethash}; use ethereum_types::U256; -use ethcore::client::TestBlockChainClient; +use ethcore::test_helpers::TestBlockChainClient; use spec::new_constantinople_test_machine; use tempdir::TempDir; diff --git a/ethcore/verification/src/verification.rs b/ethcore/verification/src/verification.rs index f778f06e1..8cf152b4a 100644 --- a/ethcore/verification/src/verification.rs +++ b/ethcore/verification/src/verification.rs @@ -377,9 +377,8 @@ mod tests { use engine::Engine; use ethkey::{Random, Generator}; use spec; - use ethcore::{ - client::TestBlockChainClient, - test_helpers::{create_test_block_with_data, create_test_block} + use ethcore::test_helpers::{ + create_test_block_with_data, create_test_block, TestBlockChainClient }; use common_types::{ engines::params::CommonParams, diff --git a/evmbin/src/info.rs b/evmbin/src/info.rs index a26e06ac7..ae3dc892e 100644 --- a/evmbin/src/info.rs +++ b/evmbin/src/info.rs @@ -19,10 +19,7 @@ use std::time::{Instant, Duration}; use common_types::transaction; -use ethcore::{ - client::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess}, - test_helpers::TrieSpec, -}; +use ethcore::test_helpers::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess, TrieSpec}; use ethereum_types::{H256, U256}; use ethjson; use pod::PodState; diff --git a/ipfs/src/route.rs b/ipfs/src/route.rs index c974a0302..8b8b64f6a 100644 --- a/ipfs/src/route.rs +++ b/ipfs/src/route.rs @@ -120,7 +120,7 @@ fn get_param<'a>(query: &'a str, name: &str) -> Option<&'a str> { mod tests { use std::sync::Arc; use super::*; - use ethcore::client::TestBlockChainClient; + use ethcore::test_helpers::TestBlockChainClient; fn get_mocked_handler() -> IpfsHandler { IpfsHandler::new(None.into(), None.into(), Arc::new(TestBlockChainClient::new())) diff --git a/rpc/src/v1/tests/helpers/miner_service.rs b/rpc/src/v1/tests/helpers/miner_service.rs index 48c7829b9..df7102e15 100644 --- a/rpc/src/v1/tests/helpers/miner_service.rs +++ b/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}; diff --git a/rpc/src/v1/tests/mocked/debug.rs b/rpc/src/v1/tests/mocked/debug.rs index ffbe8d4d1..2b497018a 100644 --- a/rpc/src/v1/tests/mocked/debug.rs +++ b/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}; diff --git a/rpc/src/v1/tests/mocked/eth.rs b/rpc/src/v1/tests/mocked/eth.rs index 9a40d2700..ff83c05b0 100644 --- a/rpc/src/v1/tests/mocked/eth.rs +++ b/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; diff --git a/rpc/src/v1/tests/mocked/eth_pubsub.rs b/rpc/src/v1/tests/mocked/eth_pubsub.rs index c3563475a..4e0500d66 100644 --- a/rpc/src/v1/tests/mocked/eth_pubsub.rs +++ b/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}; diff --git a/rpc/src/v1/tests/mocked/parity.rs b/rpc/src/v1/tests/mocked/parity.rs index 7914ac4ed..9439164ee 100644 --- a/rpc/src/v1/tests/mocked/parity.rs +++ b/rpc/src/v1/tests/mocked/parity.rs @@ -15,7 +15,7 @@ // along with Parity Ethereum. If not, see . 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}; diff --git a/rpc/src/v1/tests/mocked/parity_set.rs b/rpc/src/v1/tests/mocked/parity_set.rs index 1ae42c691..94e79e7c6 100644 --- a/rpc/src/v1/tests/mocked/parity_set.rs +++ b/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; diff --git a/rpc/src/v1/tests/mocked/personal.rs b/rpc/src/v1/tests/mocked/personal.rs index 5a339bc18..b9c3cb6d7 100644 --- a/rpc/src/v1/tests/mocked/personal.rs +++ b/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}; diff --git a/rpc/src/v1/tests/mocked/signer.rs b/rpc/src/v1/tests/mocked/signer.rs index 4000f16e5..e83497df4 100644 --- a/rpc/src/v1/tests/mocked/signer.rs +++ b/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; diff --git a/rpc/src/v1/tests/mocked/signing.rs b/rpc/src/v1/tests/mocked/signing.rs index 5b2a4ebda..cf7da360e 100644 --- a/rpc/src/v1/tests/mocked/signing.rs +++ b/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, diff --git a/rpc/src/v1/tests/mocked/signing_unsafe.rs b/rpc/src/v1/tests/mocked/signing_unsafe.rs index a91a85ea1..0d7dfb3f9 100644 --- a/rpc/src/v1/tests/mocked/signing_unsafe.rs +++ b/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 { diff --git a/rpc/src/v1/tests/mocked/traces.rs b/rpc/src/v1/tests/mocked/traces.rs index 84c8b6a0b..7dffdd8fb 100644 --- a/rpc/src/v1/tests/mocked/traces.rs +++ b/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; diff --git a/updater/src/updater.rs b/updater/src/updater.rs index 561f2c335..898fccaf7 100644 --- a/updater/src/updater.rs +++ b/updater/src/updater.rs @@ -723,7 +723,7 @@ pub mod tests { use std::sync::Arc; use semver::Version; use tempdir::TempDir; - use ethcore::client::{TestBlockChainClient, EachBlockWith}; + use ethcore::test_helpers::{TestBlockChainClient, EachBlockWith}; use self::fetch::Error; use super::*;