diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml new file mode 100644 index 000000000..0b537be41 --- /dev/null +++ b/util/journaldb/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "journaldb" +version = "0.1.0" +authors = ["Parity Technologies "] +description = "A `HashDB` which can manage a short-term journal potentially containing many forks of mutually exclusive actions" +license = "GPL3" + +[dependencies] +hashdb = { path = "../hashdb" } +kvdb = { path = "../kvdb" } +ethcore-bigint = { path = "../bigint", features = ["heapsizeof"] } +ethcore-bytes = { path = "../bytes" } +rlp = { path = "../rlp" } +memorydb = { path = "../memorydb" } +parking_lot = "0.4" +heapsize = "0.4" +util-error = { path = "../error" } +log = "0.3" diff --git a/util/src/journaldb/archivedb.rs b/util/journaldb/src/archivedb.rs similarity index 99% rename from util/src/journaldb/archivedb.rs rename to util/journaldb/src/archivedb.rs index 446a5459c..4a3225f1f 100644 --- a/util/src/journaldb/archivedb.rs +++ b/util/journaldb/src/archivedb.rs @@ -21,9 +21,9 @@ use std::collections::hash_map::Entry; use std::sync::Arc; use rlp::*; use hashdb::*; -use super::super::memorydb::*; +use super::memorydb::*; use super::{DB_PREFIX_LEN, LATEST_ERA_KEY}; -use super::traits::JournalDB; +use traits::JournalDB; use kvdb::{KeyValueDB, DBTransaction}; use bigint::hash::H256; use error::{BaseDataError, UtilError}; diff --git a/util/src/journaldb/earlymergedb.rs b/util/journaldb/src/earlymergedb.rs similarity index 100% rename from util/src/journaldb/earlymergedb.rs rename to util/journaldb/src/earlymergedb.rs diff --git a/util/src/journaldb/mod.rs b/util/journaldb/src/lib.rs similarity index 95% rename from util/src/journaldb/mod.rs rename to util/journaldb/src/lib.rs index c048342b2..d21679242 100644 --- a/util/src/journaldb/mod.rs +++ b/util/journaldb/src/lib.rs @@ -16,6 +16,17 @@ //! `JournalDB` interface and implementation. +extern crate ethcore_bigint as bigint; +extern crate ethcore_bytes as bytes; +extern crate parking_lot; +extern crate rlp; +extern crate hashdb; +extern crate memorydb; +extern crate kvdb; +extern crate util_error as error; +extern crate heapsize; +#[macro_use] extern crate log; + use std::{fmt, str}; use std::sync::Arc; @@ -26,6 +37,8 @@ mod earlymergedb; mod overlayrecentdb; mod refcounteddb; +pub mod overlaydb; + /// Export the `JournalDB` trait. pub use self::traits::JournalDB; diff --git a/util/src/overlaydb.rs b/util/journaldb/src/overlaydb.rs similarity index 100% rename from util/src/overlaydb.rs rename to util/journaldb/src/overlaydb.rs diff --git a/util/src/journaldb/overlayrecentdb.rs b/util/journaldb/src/overlayrecentdb.rs similarity index 100% rename from util/src/journaldb/overlayrecentdb.rs rename to util/journaldb/src/overlayrecentdb.rs diff --git a/util/src/journaldb/refcounteddb.rs b/util/journaldb/src/refcounteddb.rs similarity index 100% rename from util/src/journaldb/refcounteddb.rs rename to util/journaldb/src/refcounteddb.rs diff --git a/util/src/journaldb/traits.rs b/util/journaldb/src/traits.rs similarity index 100% rename from util/src/journaldb/traits.rs rename to util/journaldb/src/traits.rs