grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unify loading spec && further spec cleanups (#10948)

Browse Source 
* bundle_* macros for spec

* fixed failing tests

* renamed bundle.rs to chain.rs

* removed unused derives

* updated spec/chain.rs description
This commit is contained in:
Marek Kotewicz
2019-08-07 16:52:48 +02:00
committed by David
parent c689495826
commit 45978bc2bd
45 changed files with 378 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ethcore/src/miner/miner.rs
View File

@@ -1488,12 +1488,13 @@ mod tests {
use miner::{MinerService, PendingOrdering};
use test_helpers::{generate_dummy_client, generate_dummy_client_with_spec};
use types::transaction::{Transaction};
use crate::spec;
#[test]
fn should_prepare_block_to_seal() {
// given
let client = TestBlockChainClient::default();
let miner = Miner::new_for_tests(&Spec::new_test(), None);
let miner = Miner::new_for_tests(&spec::new_test(), None);
// when
let sealing_work = miner.work_package(&client);
@@ -1504,7 +1505,7 @@ mod tests {
fn should_still_work_after_a_couple_of_blocks() {
// given
let client = TestBlockChainClient::default();
let miner = Miner::new_for_tests(&Spec::new_test(), None);
let miner = Miner::new_for_tests(&spec::new_test(), None);
let res = miner.work_package(&client);
let hash = res.unwrap().0;
@@ -1548,7 +1549,7 @@ mod tests {
},
},
GasPricer::new_fixed(0u64.into()),
&Spec::new_test(),
&spec::new_test(),
::std::collections::HashSet::new(), // local accounts
)
}
@@ -1671,7 +1672,7 @@ mod tests {
..miner().options
},
GasPricer::new_fixed(0u64.into()),
&Spec::new_test(),
&spec::new_test(),
local_accounts,
);
let transaction = transaction();
@@ -1714,7 +1715,7 @@ mod tests {
..miner().options
},
GasPricer::new_fixed(0u64.into()),
&Spec::new_test(),
&spec::new_test(),
HashSet::from_iter(vec![transaction.sender()].into_iter()),
);
let best_block = 0;
@@ -1746,7 +1747,7 @@ mod tests {
#[test]
fn internal_seals_without_work() {
let _ = env_logger::try_init();
let spec = Spec::new_instant();
let spec = spec::new_instant();
let miner = Miner::new_for_tests(&spec, None);
let client = generate_dummy_client(2);
@@ -1775,7 +1776,7 @@ mod tests {
#[test]
fn should_not_fail_setting_engine_signer_without_account_provider() {
let spec = Spec::new_test_round;
let spec = spec::new_test_round;
let tap = Arc::new(AccountProvider::transient_provider());
let addr = tap.insert_account(keccak("1").into(), &"".into()).unwrap();
let client = generate_dummy_client_with_spec(spec);
@@ -1791,7 +1792,7 @@ mod tests {
#[test]
fn should_mine_if_internal_sealing_is_enabled() {
let spec = Spec::new_instant();
let spec = spec::new_instant();
let miner = Miner::new_for_tests(&spec, None);
let client = generate_dummy_client(2);
@@ -1802,7 +1803,7 @@ mod tests {
#[test]
fn should_not_mine_if_internal_sealing_is_disabled() {
let spec = Spec::new_test_round();
let spec = spec::new_test_round();
let miner = Miner::new_for_tests(&spec, None);
let client = generate_dummy_client(2);
@@ -1813,7 +1814,7 @@ mod tests {
#[test]
fn should_not_mine_if_no_fetch_work_request() {
let spec = Spec::new_test();
let spec = spec::new_test();
let miner = Miner::new_for_tests(&spec, None);
let client = generate_dummy_client(2);
@@ -1831,7 +1832,7 @@ mod tests {
fn notify(&self, _pow_hash: H256, _difficulty: U256, _number: u64) { }
}
let spec = Spec::new_test();
let spec = spec::new_test();
let miner = Miner::new_for_tests(&spec, None);
miner.add_work_listener(Box::new(DummyNotifyWork));
@@ -1844,7 +1845,7 @@ mod tests {
#[test]
fn should_set_new_minimum_gas_price() {
// Creates a new GasPricer::Fixed behind the scenes
let miner = Miner::new_for_tests(&Spec::new_test(), None);
let miner = Miner::new_for_tests(&spec::new_test(), None);
let expected_minimum_gas_price: U256 = 0x1337.into();
miner.set_minimal_gas_price(expected_minimum_gas_price).unwrap();
@@ -1882,7 +1883,7 @@ mod tests {
#[cfg(feature = "price-info")]
fn should_fail_to_set_new_minimum_gas_price() {
// We get a fixed gas pricer by default, need to change that
let miner = Miner::new_for_tests(&Spec::new_test(), None);
let miner = Miner::new_for_tests(&spec::new_test(), None);
let calibrated_gas_pricer = dynamic_gas_pricer();
*miner.gas_pricer.lock() = calibrated_gas_pricer;