refactor: move cachedb to db module

zhangsoledad · Apr 10, 2019 · 4c06dca · 4c06dca
1 parent ecb4ec0
commit 4c06dca
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benches/benches/process_block.rs b/benches/benches/process_block.rs
@@ -6,9 +6,8 @@ use ckb_core::script::Script;
 use ckb_core::transaction::{
     CellInput, CellOutput, OutPoint, ProposalShortId, Transaction, TransactionBuilder,
 };
-use ckb_db::{DBConfig, RocksDB};
+use ckb_db::{CacheDB, DBConfig, RocksDB};
 use ckb_notify::NotifyService;
-use ckb_shared::cachedb::CacheDB;
 use ckb_shared::shared::{Shared, SharedBuilder};
 use ckb_shared::store::ChainKVStore;
 use ckb_traits::ChainProvider;

diff --git a/db/Cargo.toml b/db/Cargo.toml
@@ -14,6 +14,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 failure = "0.1.5"
 log = "0.4"
+lru-cache = { git = "https://github.com/nervosnetwork/lru-cache" }
 
 [dev-dependencies]
 tempfile = "3.0"
diff --git a/shared/src/cachedb.rs → db/src/cachedb.rs b/shared/src/cachedb.rs → db/src/cachedb.rs
@@ -1,4 +1,4 @@
-use ckb_db::{Col, KeyValueDB, Result};
+use crate::{Col, KeyValueDB, Result};
 use ckb_util::RwLock;
 use fnv::FnvHashMap;
 use lru_cache::LruCache;

diff --git a/db/src/lib.rs b/db/src/lib.rs
@@ -7,10 +7,12 @@ use failure::Fail;
 use std::ops::Range;
 use std::result;
 
+pub mod cachedb;
 pub mod config;
 pub mod memorydb;
 pub mod rocksdb;
 
+pub use crate::cachedb::CacheDB;
 pub use crate::config::DBConfig;
 pub use crate::memorydb::MemoryKeyValueDB;
 pub use crate::rocksdb::RocksDB;

diff --git a/shared/src/lib.rs b/shared/src/lib.rs
@@ -7,7 +7,6 @@
 //! - [Chain](chain::chain::Chain) represent a struct which
 //!   implement `ChainProvider`
 
-pub mod cachedb;
 pub mod cell_set;
 pub mod chain_state;
 pub mod error;

diff --git a/shared/src/shared.rs b/shared/src/shared.rs
@@ -1,4 +1,3 @@
-use crate::cachedb::CacheDB;
 use crate::cell_set::CellSet;
 use crate::chain_state::ChainState;
 use crate::error::SharedError;
@@ -13,7 +12,7 @@ use ckb_core::extras::BlockExt;
 use ckb_core::header::{BlockNumber, Header};
 use ckb_core::transaction::{Capacity, ProposalShortId, Transaction};
 use ckb_core::uncle::UncleBlock;
-use ckb_db::{DBConfig, KeyValueDB, MemoryKeyValueDB, RocksDB};
+use ckb_db::{CacheDB, DBConfig, KeyValueDB, MemoryKeyValueDB, RocksDB};
 use ckb_traits::{BlockMedianTimeContext, ChainProvider};
 use ckb_util::Mutex;
 use failure::Error;

diff --git a/src/cli/export.rs b/src/cli/export.rs
@@ -1,7 +1,6 @@
 use super::super::setup::Setup;
-use ckb_db::RocksDB;
+use ckb_db::{CacheDB, RocksDB};
 use ckb_instrument::{Export, Format};
-use ckb_shared::cachedb::CacheDB;
 use ckb_shared::shared::SharedBuilder;
 use clap::{value_t, ArgMatches};
 

diff --git a/src/cli/import.rs b/src/cli/import.rs
@@ -1,9 +1,8 @@
 use super::super::setup::Setup;
 use ckb_chain::chain::ChainBuilder;
-use ckb_db::RocksDB;
+use ckb_db::{CacheDB, RocksDB};
 use ckb_instrument::{Format, Import};
 use ckb_notify::NotifyService;
-use ckb_shared::cachedb::CacheDB;
 use ckb_shared::shared::SharedBuilder;
 use clap::{value_t, ArgMatches};
 

diff --git a/src/cli/run_impl.rs b/src/cli/run_impl.rs
@@ -1,12 +1,11 @@
 use crate::helper::wait_for_exit;
 use crate::Setup;
 use ckb_chain::chain::{ChainBuilder, ChainController};
-use ckb_db::RocksDB;
+use ckb_db::{CacheDB, RocksDB};
 use ckb_miner::BlockAssembler;
 use ckb_network::{CKBProtocol, NetworkService, NetworkState, ProtocolId};
 use ckb_notify::{NotifyController, NotifyService};
 use ckb_rpc::RpcServer;
-use ckb_shared::cachedb::CacheDB;
 use ckb_shared::index::ChainIndex;
 use ckb_shared::shared::{Shared, SharedBuilder};
 use ckb_sync::{NetTimeProtocol, NetworkProtocol, Relayer, Synchronizer};