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

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};

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;

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;

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::{

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

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 {