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

Fixes tests

Browse Source
This commit is contained in:
Dmitry Kashitsyn 2017-10-17 22:24:47 +07:00
parent 0e912bca5b
commit 153b8572dd
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/src/snapshot/service.rs
View File

@ -625,7 +625,7 @@ mod tests {
use io::{IoService}; use io::{IoService};
use devtools::RandomTempPath; use devtools::RandomTempPath;
use tests::helpers::get_test_spec; use tests::helpers::get_test_spec;
use util::journaldb::Algorithm; use journaldb::Algorithm;
use error::Error; use error::Error;
use snapshot::{ManifestData, RestorationStatus, SnapshotService}; use snapshot::{ManifestData, RestorationStatus, SnapshotService};
use super::*; use super::*;

2
ethcore/src/snapshot/tests/helpers.rs
View File

@ -35,7 +35,7 @@ use util::DBValue;
use kvdb::KeyValueDB; use kvdb::KeyValueDB;
use bigint::hash::H256; use bigint::hash::H256;
use hashdb::HashDB; use hashdb::HashDB;
use util::journaldb; use journaldb;
use trie::{Alphabet, StandardMap, SecTrieDBMut, TrieMut, ValueMode}; use trie::{Alphabet, StandardMap, SecTrieDBMut, TrieMut, ValueMode};
use trie::{TrieDB, TrieDBMut, Trie}; use trie::{TrieDB, TrieDBMut, Trie};

4
ethcore/src/snapshot/tests/service.rs
View File

@ -69,7 +69,7 @@ fn restored_is_equivalent() {
engine: spec.engine.clone(), engine: spec.engine.clone(),
genesis_block: spec.genesis_block(), genesis_block: spec.genesis_block(),
db_config: db_config, db_config: db_config,
pruning: ::util::journaldb::Algorithm::Archive, pruning: ::journaldb::Algorithm::Archive,
channel: IoChannel::disconnected(), channel: IoChannel::disconnected(),
snapshot_root: path, snapshot_root: path,
db_restore: client2.clone(), db_restore: client2.clone(),
@ -112,7 +112,7 @@ fn guards_delete_folders() {
engine: spec.engine.clone(), engine: spec.engine.clone(),
genesis_block: spec.genesis_block(), genesis_block: spec.genesis_block(),
db_config: DatabaseConfig::with_columns(::db::NUM_COLUMNS), db_config: DatabaseConfig::with_columns(::db::NUM_COLUMNS),
pruning: ::util::journaldb::Algorithm::Archive, pruning: ::journaldb::Algorithm::Archive,
channel: IoChannel::disconnected(), channel: IoChannel::disconnected(),
snapshot_root: path.clone(), snapshot_root: path.clone(),
db_restore: Arc::new(NoopDBRestore), db_restore: Arc::new(NoopDBRestore),

2
ethcore/src/snapshot/tests/state.rs
View File

@ -26,7 +26,7 @@ use error::Error;
use rand::{XorShiftRng, SeedableRng}; use rand::{XorShiftRng, SeedableRng};
use bigint::hash::H256; use bigint::hash::H256;
use util::journaldb::{self, Algorithm}; use journaldb::{self, Algorithm};
use kvdb_rocksdb::{Database, DatabaseConfig}; use kvdb_rocksdb::{Database, DatabaseConfig};
use memorydb::MemoryDB; use memorydb::MemoryDB;
use parking_lot::Mutex; use parking_lot::Mutex;

3
ethcore/src/tests/helpers.rs
View File

@ -36,7 +36,6 @@ use state_db::StateDB;
use state::*; use state::*;
use std::sync::Arc; use std::sync::Arc;
use transaction::{Action, Transaction, SignedTransaction}; use transaction::{Action, Transaction, SignedTransaction};
use util::*;
use views::BlockView; use views::BlockView;
// TODO: move everything over to get_null_spec. // TODO: move everything over to get_null_spec.
@ -282,7 +281,7 @@ pub fn get_temp_state_with_factory(factory: EvmFactory) -> State<::state_db::Sta
pub fn get_temp_state_db() -> StateDB { pub fn get_temp_state_db() -> StateDB {
let db = new_db(); let db = new_db();
let journal_db = journaldb::new(db, journaldb::Algorithm::EarlyMerge, ::db::COL_STATE); let journal_db = ::journaldb::new(db, ::journaldb::Algorithm::EarlyMerge, ::db::COL_STATE);
StateDB::new(journal_db, 5 * 1024 * 1024) StateDB::new(journal_db, 5 * 1024 * 1024)
} }