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

Separate migrations from util (#6690)

Browse Source 
* separate migration from util and make its dependencies into libs:

* snappy
* kvdb
* error
* common

* renamed common -> macros

* util error does not depend on snappy module

* ethsync does not depend on util nor ethcore_error

* nibbleslice and nibblevec merged with patricia_trie crate

* removed unused dependencies from util

* util journaldb traits does not need to be public

* util_error

* fixed ethcore compile error

* ignore .swo files

* Update chain.rs
This commit is contained in:
Marek Kotewicz
2017-10-10 20:01:27 +02:00
committed by GitHub
parent 4e8853c9f7
commit 6279ff32f5
86 changed files with 322 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
local-store/Cargo.toml
View File

@@ -8,7 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
ethcore-util = { path = "../util" }
ethcore-io = { path = "../util/io" }
ethcore = { path = "../ethcore" }
rlp = {path = "../util/rlp" }
rlp = { path = "../util/rlp" }
kvdb = { path = "../util/kvdb" }
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"

9
local-store/src/lib.rs
View File

@@ -26,7 +26,7 @@ use ethcore::transaction::{
use ethcore::service::ClientIoMessage;
use io::IoHandler;
use rlp::UntrustedRlp;
use util::kvdb::KeyValueDB;
use kvdb::KeyValueDB;
extern crate ethcore;
extern crate ethcore_util as util;
@@ -34,6 +34,7 @@ extern crate ethcore_io as io;
extern crate rlp;
extern crate serde_json;
extern crate serde;
extern crate kvdb;
#[macro_use]
extern crate serde_derive;
@@ -242,7 +243,7 @@ mod tests {
#[test]
fn twice_empty() {
let db = Arc::new(::util::kvdb::in_memory(0));
let db = Arc::new(::kvdb::in_memory(0));
{
let store = super::create(db.clone(), None, Dummy(vec![]));
@@ -271,7 +272,7 @@ mod tests {
PendingTransaction::new(signed, condition)
}).collect();
let db = Arc::new(::util::kvdb::in_memory(0));
let db = Arc::new(::kvdb::in_memory(0));
{
// nothing written yet, will write pending.
@@ -310,7 +311,7 @@ mod tests {
PendingTransaction::new(signed, None)
});
let db = Arc::new(::util::kvdb::in_memory(0));
let db = Arc::new(::kvdb::in_memory(0));
{
// nothing written, will write bad.
let store = super::create(db.clone(), None, Dummy(transactions.clone()));