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

18
ethcore/light/src/client/header_chain.rs
View File

@@ -874,7 +874,7 @@ mod tests {
use cache::Cache;
use common_types::header::Header;
use common_types::ids::BlockId;
use ethcore::spec::Spec;
use ethcore::spec;
use ethereum_types::U256;
use kvdb::KeyValueDB;
use kvdb_memorydb;
@@ -888,7 +888,7 @@ mod tests {
#[test]
fn basic_chain() {
let spec = Spec::new_test();
let spec = spec::new_test();
let genesis_header = spec.genesis_header();
let db = make_db();
@@ -922,7 +922,7 @@ mod tests {
#[test]
fn reorganize() {
let spec = Spec::new_test();
let spec = spec::new_test();
let genesis_header = spec.genesis_header();
let db = make_db();
let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
@@ -1005,7 +1005,7 @@ mod tests {
#[test]
fn earliest_is_latest() {
let spec = Spec::new_test();
let spec = spec::new_test();
let db = make_db();
let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
@@ -1017,7 +1017,7 @@ mod tests {
#[test]
fn restore_from_db() {
let spec = Spec::new_test();
let spec = spec::new_test();
let genesis_header = spec.genesis_header();
let db = make_db();
let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
@@ -1055,7 +1055,7 @@ mod tests {
#[test]
fn restore_higher_non_canonical() {
let spec = Spec::new_test();
let spec = spec::new_test();
let genesis_header = spec.genesis_header();
let db = make_db();
let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
@@ -1112,7 +1112,7 @@ mod tests {
#[test]
fn genesis_header_available() {
let spec = Spec::new_test();
let spec = spec::new_test();
let genesis_header = spec.genesis_header();
let db = make_db();
let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
@@ -1127,7 +1127,7 @@ mod tests {
#[test]
fn epoch_transitions_available_after_cht() {
let spec = Spec::new_test();
let spec = spec::new_test();
let genesis_header = spec.genesis_header();
let db = make_db();
let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
@@ -1193,7 +1193,7 @@ mod tests {
#[test]
fn hardcoded_sync_gen() {
let spec = Spec::new_test();
let spec = spec::new_test();
let genesis_header = spec.genesis_header();
let db = make_db();

4
ethcore/light/src/client/service.rs
View File

@@ -113,7 +113,7 @@ impl<T: ChainDataFetcher> IoHandler<ClientIoMessage> for ImportBlocks<T> {
#[cfg(test)]
mod tests {
use super::Service;
use ethcore::spec::Spec;
use ethcore::spec;
use std::sync::Arc;
use cache::Cache;
@@ -125,7 +125,7 @@ mod tests {
#[test]
fn it_works() {
let db = test_helpers::new_db();
let spec = Spec::new_test();
let spec = spec::new_test();
let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
Service::start(Default::default(), &spec, fetch::unavailable(), db, cache).unwrap();