Merge crates related databases into util/db

This patch merges hashdb, journaldb and memorydb.

Author: Seulgi Kim

Cargo.lock

@@ -6,6 +6,7 @@ edition = "2018"
 
 [dependencies]
 codechain-crypto = { git = "https://github.com/CodeChain-io/rust-codechain-crypto.git", version = "0.1" }
+codechain-db = { path = "../util/db" }
 codechain-io = { path = "../util/io" }
 codechain-json = { path = "../json" }
 codechain-key = { path = "../key" }
@@ -20,16 +21,13 @@ codechain-stratum = { path = "../stratum" }
 codechain-vm = { path = "../vm" }
 crossbeam-channel = "0.3"
 cuckoo = { git = "https://github.com/CodeChain-io/rust-cuckoo.git", rev = "280cab9c" }
-hashdb = { path = "../util/hashdb" }
 hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
-journaldb = { path = "../util/journaldb" }
 kvdb = "0.1"
 kvdb-rocksdb = "0.1"
 kvdb-memorydb = "0.1"
 linked-hash-map = "0.5"
 log = "0.4.6"
 lru-cache = "0.1.2"
-memorydb = { path = "../util/memorydb" }
 num-rational = "0.2.1"
 parking_lot = "0.6.0"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }

core/Cargo.toml

@@ -18,6 +18,7 @@ use std::ops::Range;
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
 use std::sync::{Arc, Weak};
 
+use cdb::{new_journaldb, Algorithm, AsHashDB};
 use cio::IoChannel;
 use ckey::{Address, NetworkId, PlatformAddress, Public};
 use cmerkle::Result as TrieResult;
@@ -29,8 +30,6 @@ use ctimer::{TimeoutHandler, TimerApi, TimerScheduleError, TimerToken};
 use ctypes::transaction::{AssetTransferInput, PartialHashing, ShardTransaction};
 use ctypes::{BlockHash, BlockNumber, CommonParams, ShardId, Tracker, TxHash};
 use cvm::{decode, execute, ChainTimeInfo, ScriptResult, VMConfig};
-use hashdb::AsHashDB;
-use journaldb;
 use kvdb::{DBTransaction, KeyValueDB};
 use parking_lot::{Mutex, RwLock, RwLockReadGuard};
 use primitives::{Bytes, H160, H256, U256};
@@ -91,7 +90,7 @@ impl Client {
         message_channel: IoChannel<ClientIoMessage>,
         reseal_timer: TimerApi,
     ) -> Result<Arc<Client>, Error> {
-        let journal_db = journaldb::new(Arc::clone(&db), journaldb::Algorithm::Archive, crate::db::COL_STATE);
+        let journal_db = new_journaldb(Arc::clone(&db), Algorithm::Archive, crate::db::COL_STATE);
         let mut state_db = StateDB::new(journal_db);
         if !scheme.check_genesis_root(state_db.as_hashdb()) {
             return Err(SchemeError::InvalidState.into())

core/src/client/client.rs

@@ -36,6 +36,7 @@ use std::ops::Range;
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrder};
 use std::sync::Arc;
 
+use cdb;
 use ckey::{public_to_address, Address, Generator, KeyPair, NetworkId, PlatformAddress, Private, Public, Random};
 use cmerkle::skewed_merkle_root;
 use cnetwork::NodeId;
@@ -45,7 +46,6 @@ use ctimer::{TimeoutHandler, TimerToken};
 use ctypes::transaction::{Action, Transaction};
 use ctypes::{BlockHash, BlockNumber, CommonParams, Header as BlockHeader, Tracker, TxHash};
 use cvm::ChainTimeInfo;
-use journaldb;
 use kvdb::KeyValueDB;
 use kvdb_memorydb;
 use parking_lot::RwLock;
@@ -338,7 +338,7 @@ impl TestBlockChainClient {
 
 pub fn get_temp_state_db() -> StateDB {
     let db = kvdb_memorydb::create(NUM_COLUMNS.unwrap_or(0));
-    let journal_db = journaldb::new(Arc::new(db), journaldb::Algorithm::Archive, COL_STATE);
+    let journal_db = cdb::new_journaldb(Arc::new(db), cdb::Algorithm::Archive, COL_STATE);
     StateDB::new(journal_db)
 }
 

core/src/client/test_client.rs

@@ -17,6 +17,7 @@
 #![cfg_attr(feature = "nightly", feature(test))]
 
 extern crate codechain_crypto as ccrypto;
+extern crate codechain_db as cdb;
 extern crate codechain_io as cio;
 extern crate codechain_json as cjson;
 extern crate codechain_key as ckey;
@@ -32,14 +33,11 @@ extern crate codechain_types as ctypes;
 extern crate codechain_vm as cvm;
 extern crate crossbeam_channel;
 extern crate cuckoo;
-extern crate hashdb;
-extern crate journaldb;
 extern crate kvdb;
 extern crate kvdb_memorydb;
 extern crate kvdb_rocksdb;
 extern crate linked_hash_map;
 extern crate lru_cache;
-extern crate memorydb;
 extern crate num_rational;
 extern crate primitives;
 extern crate rand;

core/src/lib.rs

@@ -18,13 +18,13 @@ use std::io::Read;
 use std::sync::Arc;
 
 use ccrypto::{blake256, BLAKE_NULL_RLP};
+use cdb::{AsHashDB, HashDB};
 use cjson;
 use ckey::Address;
 use cmerkle::{TrieFactory, TrieMut};
 use cstate::{Metadata, MetadataAddress, Shard, ShardAddress, StateDB, StateResult, StateWithCache, TopLevelState};
 use ctypes::errors::SyntaxError;
 use ctypes::{BlockHash, CommonParams, Header, ShardId};
-use hashdb::{AsHashDB, HashDB};
 use parking_lot::RwLock;
 use primitives::{Bytes, H256, U256};
 use rlp::{Encodable, Rlp, RlpStream};

core/src/scheme/scheme.rs

@@ -6,13 +6,12 @@ edition = "2018"
 
 [dependencies]
 codechain-crypto = { git = "https://github.com/CodeChain-io/rust-codechain-crypto.git", version = "0.1" }
+codechain-db = { path = "../util/db" }
 codechain-logger = { path = "../util/logger" }
 codechain-merkle = { path = "../util/merkle" }
 codechain-key = { path = "../key" }
 codechain-types = { path = "../types" }
 codechain-vm = { path = "../vm" }
-hashdb = { path = "../util/hashdb" }
-journaldb = { path = "../util/journaldb" }
 kvdb = "0.1"
 kvdb-memorydb = "0.1"
 log = "0.4.6"

state/Cargo.toml

@@ -33,9 +33,8 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
+use cdb::{new_journaldb, Algorithm, AsHashDB, HashDB, JournalDB};
 use ctypes::ShardId;
-use hashdb::{AsHashDB, HashDB};
-use journaldb::{self, Algorithm, JournalDB};
 use kvdb::DBTransaction;
 use kvdb_memorydb;
 use primitives::H256;
@@ -64,7 +63,7 @@ impl StateDB {
 
     pub fn new_with_memorydb() -> Self {
         let memorydb = Arc::new(kvdb_memorydb::create(0));
-        let db = journaldb::new(memorydb, Algorithm::Archive, None);
+        let db = new_journaldb(memorydb, Algorithm::Archive, None);
         Self::new(db)
     }
 

state/src/db/state_db.rs

@@ -19,6 +19,7 @@ use std::collections::HashSet;
 use std::iter::{once, FromIterator};
 
 use ccrypto::{Blake, BLAKE_NULL_RLP};
+use cdb::AsHashDB;
 use ckey::Address;
 use cmerkle::{self, TrieError, TrieFactory};
 use ctypes::errors::{RuntimeError, UnlockFailureReason};
@@ -29,7 +30,6 @@ use ctypes::transaction::{
 use ctypes::util::unexpected::Mismatch;
 use ctypes::{BlockNumber, ShardId, Tracker};
 use cvm::{decode, execute, ChainTimeInfo, ScriptResult, VMConfig};
-use hashdb::AsHashDB;
 use primitives::{Bytes, H160, H256};
 
 use crate::cache::ShardCache;

state/src/impls/shard_level.rs

@@ -39,6 +39,7 @@ use std::cell::{RefCell, RefMut};
 use std::collections::HashMap;
 
 use ccrypto::BLAKE_NULL_RLP;
+use cdb::AsHashDB;
 use ckey::{public_to_address, recover, verify_address, Address, NetworkId, Public, Signature};
 use cmerkle::{Result as TrieResult, TrieError, TrieFactory};
 use ctypes::errors::RuntimeError;
@@ -50,7 +51,6 @@ use ctypes::util::unexpected::Mismatch;
 use ctypes::Tracker;
 use ctypes::{BlockNumber, CommonParams, ShardId, TxHash};
 use cvm::ChainTimeInfo;
-use hashdb::AsHashDB;
 use kvdb::DBTransaction;
 #[cfg(test)]
 use primitives::H160;
@@ -1012,7 +1012,7 @@ fn is_active_account(state: &dyn TopStateView, address: &Address) -> TrieResult<
 mod tests_state {
     use std::sync::Arc;
 
-    use journaldb::{self, Algorithm};
+    use cdb::{new_journaldb, Algorithm};
 
     use super::*;
     use crate::tests::helpers::{empty_top_state, get_memory_db, get_temp_state, get_temp_state_db};
@@ -1077,7 +1077,7 @@ mod tests_state {
     #[test]
     fn get_from_database() {
         let memory_db = get_memory_db();
-        let jorunal = journaldb::new(Arc::clone(&memory_db), Algorithm::Archive, Some(0));
+        let jorunal = new_journaldb(Arc::clone(&memory_db), Algorithm::Archive, Some(0));
         let db = StateDB::new(jorunal.boxed_clone());
         let a = Address::default();
         let root = {
@@ -1108,7 +1108,7 @@ mod tests_state {
     #[test]
     fn get_from_cache() {
         let memory_db = get_memory_db();
-        let jorunal = journaldb::new(Arc::clone(&memory_db), Algorithm::Archive, Some(0));
+        let jorunal = new_journaldb(Arc::clone(&memory_db), Algorithm::Archive, Some(0));
         let mut db = StateDB::new(jorunal.boxed_clone());
         let a = Address::default();
         let root = {
@@ -1180,7 +1180,7 @@ mod tests_state {
     fn remove_from_database() {
         let a = Address::default();
         let memory_db = get_memory_db();
-        let jorunal = journaldb::new(Arc::clone(&memory_db), Algorithm::Archive, Some(0));
+        let jorunal = new_journaldb(Arc::clone(&memory_db), Algorithm::Archive, Some(0));
         let mut db = StateDB::new(jorunal.boxed_clone());
         let root = {
             let mut state = empty_top_state(StateDB::new(jorunal));

state/src/impls/top_level.rs

@@ -15,14 +15,13 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 extern crate codechain_crypto as ccrypto;
+extern crate codechain_db as cdb;
 extern crate codechain_merkle as cmerkle;
 #[macro_use]
 extern crate codechain_logger as clogger;
 extern crate codechain_key as ckey;
 extern crate codechain_types as ctypes;
 extern crate codechain_vm as cvm;
-extern crate hashdb;
-extern crate journaldb;
 extern crate kvdb;
 extern crate kvdb_memorydb;
 extern crate lru_cache;

state/src/lib.rs

@@ -17,10 +17,10 @@
 pub mod helpers {
     use std::sync::Arc;
 
+    use cdb::AsHashDB;
     use cmerkle::{TrieFactory, TrieMut};
     use ctypes::{BlockNumber, Tracker};
     use cvm::ChainTimeInfo;
-    use hashdb::AsHashDB;
     use kvdb::KeyValueDB;
     use kvdb_memorydb;
     use primitives::H256;