ethcore test::helpers cleanup (#8086)

ethcore/src/tests/client.rs

@@ -23,7 +23,10 @@ use state::{self, State, CleanupMode};
 use executive::{Executive, TransactOptions};
 use ethereum;
 use block::IsBlock;
-use tests::helpers::*;
+use tests::helpers::{
+	generate_dummy_client, push_blocks_to_client, get_test_client_with_blocks, get_good_dummy_block_seq,
+	generate_dummy_client_with_data, get_good_dummy_block, get_bad_state_dummy_block
+};
 use types::filter::Filter;
 use ethereum_types::{U256, Address};
 use kvdb_rocksdb::{Database, DatabaseConfig};
@@ -38,7 +41,7 @@ use tempdir::TempDir;
 #[test]
 fn imports_from_empty() {
 	let tempdir = TempDir::new("").unwrap();
-	let spec = get_test_spec();
+	let spec = Spec::new_test();
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
 	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 
@@ -77,7 +80,7 @@ fn should_return_registrar() {
 #[test]
 fn returns_state_root_basic() {
 	let client = generate_dummy_client(6);
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let genesis_header = test_spec.genesis_header();
 
 	assert!(client.state_data(genesis_header.state_root()).is_some());
@@ -86,7 +89,7 @@ fn returns_state_root_basic() {
 #[test]
 fn imports_good_block() {
 	let tempdir = TempDir::new("").unwrap();
-	let spec = get_test_spec();
+	let spec = Spec::new_test();
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
 	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 
@@ -111,7 +114,7 @@ fn imports_good_block() {
 #[test]
 fn query_none_block() {
 	let tempdir = TempDir::new("").unwrap();
-	let spec = get_test_spec();
+	let spec = Spec::new_test();
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
 	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 

ethcore/src/tests/evm.rs

@@ -1,3 +1,19 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
 //! Tests of EVM integration with transaction execution.
 
 use std::sync::Arc;
@@ -6,7 +22,7 @@ use vm::{EnvInfo, ActionParams, ActionValue, CallType, ParamsType};
 use evm::{Factory, VMType};
 use executive::Executive;
 use state::Substate;
-use tests::helpers::*;
+use tests::helpers::get_temp_state_with_factory;
 use trace::{NoopVMTracer, NoopTracer};
 use transaction::SYSTEM_ADDRESS;
 

ethcore/src/tests/helpers.rs

@@ -20,29 +20,22 @@ use block::{OpenBlock, Drain};
 use blockchain::{BlockChain, Config as BlockChainConfig};
 use bytes::Bytes;
 use client::{Client, ClientConfig, ChainInfo, ImportBlock, ChainNotify};
-use ethereum::ethash::EthashParams;
 use ethkey::KeyPair;
 use evm::Factory as EvmFactory;
 use factory::Factories;
 use hash::keccak;
 use header::Header;
 use io::*;
-use machine::EthashExtensions;
 use miner::Miner;
 use parking_lot::RwLock;
 use rlp::{self, RlpStream};
-use spec::*;
+use spec::Spec;
 use state_db::StateDB;
 use state::*;
 use std::sync::Arc;
 use transaction::{Action, Transaction, SignedTransaction};
 use views::BlockView;
 
-// TODO: move everything over to get_null_spec.
-pub fn get_test_spec() -> Spec {
-	Spec::new_test()
-}
-
 pub fn create_test_block(header: &Header) -> Bytes {
 	let mut rlp = RlpStream::new_list(3);
 	rlp.append(header);
@@ -100,16 +93,16 @@ pub fn generate_dummy_client_with_data(block_number: u32, txs_per_block: usize,
 }
 
 
-pub fn generate_dummy_client_with_spec_and_data<F>(get_test_spec: F, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
-	generate_dummy_client_with_spec_accounts_and_data(get_test_spec, None, block_number, txs_per_block, tx_gas_prices)
+pub fn generate_dummy_client_with_spec_and_data<F>(test_spec: F, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
+	generate_dummy_client_with_spec_accounts_and_data(test_spec, None, block_number, txs_per_block, tx_gas_prices)
 }
 
-pub fn generate_dummy_client_with_spec_and_accounts<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>) -> Arc<Client> where F: Fn()->Spec {
-	generate_dummy_client_with_spec_accounts_and_data(get_test_spec, accounts, 0, 0, &[])
+pub fn generate_dummy_client_with_spec_and_accounts<F>(test_spec: F, accounts: Option<Arc<AccountProvider>>) -> Arc<Client> where F: Fn()->Spec {
+	generate_dummy_client_with_spec_accounts_and_data(test_spec, accounts, 0, 0, &[])
 }
 
-pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
-	let test_spec = get_test_spec();
+pub fn generate_dummy_client_with_spec_accounts_and_data<F>(test_spec: F, accounts: Option<Arc<AccountProvider>>, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
+	let test_spec = test_spec();
 	let client_db = new_db();
 
 	let client = Client::new(
@@ -179,7 +172,7 @@ pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, ac
 }
 
 pub fn push_blocks_to_client(client: &Arc<Client>, timestamp_salt: u64, starting_number: usize, block_number: usize) {
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let state_root = test_spec.genesis_header().state_root().clone();
 	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
 
@@ -208,7 +201,7 @@ pub fn push_blocks_to_client(client: &Arc<Client>, timestamp_salt: u64, starting
 }
 
 pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> Arc<Client> {
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let client_db = new_db();
 
 	let client = Client::new(
@@ -285,12 +278,12 @@ pub fn get_temp_state_db() -> StateDB {
 }
 
 pub fn get_good_dummy_block_seq(count: usize) -> Vec<Bytes> {
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	get_good_dummy_block_fork_seq(1, count, &test_spec.genesis_header().hash())
 }
 
 pub fn get_good_dummy_block_fork_seq(start_number: usize, count: usize, parent_hash: &H256) -> Vec<Bytes> {
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
 	let mut rolling_timestamp = start_number as u64 * 10;
 	let mut parent = *parent_hash;
@@ -314,7 +307,7 @@ pub fn get_good_dummy_block_fork_seq(start_number: usize, count: usize, parent_h
 
 pub fn get_good_dummy_block_hash() -> (H256, Bytes) {
 	let mut block_header = Header::new();
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
 	block_header.set_gas_limit(genesis_gas);
 	block_header.set_difficulty(U256::from(0x20000));
@@ -333,7 +326,7 @@ pub fn get_good_dummy_block() -> Bytes {
 
 pub fn get_bad_state_dummy_block() -> Bytes {
 	let mut block_header = Header::new();
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
 
 	block_header.set_gas_limit(genesis_gas);
@@ -346,49 +339,6 @@ pub fn get_bad_state_dummy_block() -> Bytes {
 	create_test_block(&block_header)
 }
 
-pub fn get_default_ethash_extensions() -> EthashExtensions {
-	EthashExtensions {
-		homestead_transition: 1150000,
-		eip150_transition: u64::max_value(),
-		eip160_transition: u64::max_value(),
-		eip161abc_transition: u64::max_value(),
-		eip161d_transition: u64::max_value(),
-		dao_hardfork_transition: u64::max_value(),
-		dao_hardfork_beneficiary: "0000000000000000000000000000000000000001".into(),
-		dao_hardfork_accounts: Vec::new(),
-	}
-}
-
-pub fn get_default_ethash_params() -> EthashParams {
-	EthashParams {
-		minimum_difficulty: U256::from(131072),
-		difficulty_bound_divisor: U256::from(2048),
-		difficulty_increment_divisor: 10,
-		metropolis_difficulty_increment_divisor: 9,
-		homestead_transition: 1150000,
-		duration_limit: 13,
-		block_reward: 0.into(),
-		difficulty_hardfork_transition: u64::max_value(),
-		difficulty_hardfork_bound_divisor: U256::from(0),
-		bomb_defuse_transition: u64::max_value(),
-		eip100b_transition: u64::max_value(),
-		ecip1010_pause_transition: u64::max_value(),
-		ecip1010_continue_transition: u64::max_value(),
-		ecip1017_era_rounds: u64::max_value(),
-		mcip3_transition: u64::max_value(),
-		mcip3_miner_reward: 0.into(),
-		mcip3_ubi_reward: 0.into(),
-		mcip3_ubi_contract: "0000000000000000000000000000000000000001".into(),
-		mcip3_dev_reward: 0.into(),
-		mcip3_dev_contract: "0000000000000000000000000000000000000001".into(),
-		eip649_transition: u64::max_value(),
-		eip649_delay: 3_000_000,
-		eip649_reward: None,
-		expip2_transition: u64::max_value(),
-		expip2_duration_limit: 30,
-	}
-}
-
 #[derive(Default)]
 pub struct TestNotify {
 	pub messages: RwLock<Vec<Bytes>>,

ethcore/src/tests/trace.rs

@@ -24,7 +24,7 @@ use ethereum_types::{U256, Address};
 use io::*;
 use spec::*;
 use client::*;
-use tests::helpers::*;
+use tests::helpers::get_temp_state_db;
 use client::{BlockChainClient, Client, ClientConfig};
 use kvdb_rocksdb::{Database, DatabaseConfig};
 use std::sync::Arc;