split traits of storage & merge rpc implementation

Author: Officeyutong

light-client-bin/src/rpc/mod.rs

@@ -13,10 +13,9 @@ use log::debug;
 use ckb_light_client_lib::{
     error::{Error, Result},
     protocols::{
-        FilterProtocol, LightClientProtocol, Peers, PendingTxs, RelayProtocol, SyncProtocol,
-        BAD_MESSAGE_ALLOWED_EACH_HOUR, CHECK_POINT_INTERVAL,
+        BAD_MESSAGE_ALLOWED_EACH_HOUR, CHECK_POINT_INTERVAL, FilterProtocol, LightClientProtocol, Peers, PendingTxs, RelayProtocol, SyncProtocol
     },
-    storage::Storage,
+    storage::{Storage, db::{StorageBatchRelatedOperations, StorageGeneralOperations}},
     utils,
 };
 

light-client-bin/src/rpc/rpc_rocksdb.rs

@@ -2,8 +2,8 @@ mod service;
 
 use ckb_chain_spec::{consensus::Consensus, ChainSpec};
 use ckb_light_client_lib::{
-    protocols::{Peers, CHECK_POINT_INTERVAL},
-    storage::Storage,
+    protocols::{CHECK_POINT_INTERVAL, Peers},
+    storage::{Storage, db::StorageBatchRelatedOperations},
 };
 use ckb_resource::Resource;
 use tempfile::TempDir;

light-client-bin/src/rpc/rpc_rusqlite.rs

@@ -21,7 +21,7 @@ use ckb_light_client_lib::{
         FetchStatus, Order, ScriptStatus, ScriptType, SearchKey, SearchKeyFilter,
         SetScriptsCommand, Status, TransactionWithStatus, TxStatus,
     },
-    storage::{self, HeaderWithExtension, StorageWithChainData},
+    storage::{self, HeaderWithExtension, StorageWithChainData, db::{StorageBatchRelatedOperations, StorageGeneralOperations, StorageGetPinnedRelatedOperations}},
 };
 use ckb_light_client_lib::storage::db::StorageHighLevelOperations;
 use crate::{

light-client-bin/src/subcmds.rs

@@ -1,6 +1,6 @@
 use super::{components, BAD_MESSAGE_BAN_TIME};
 use crate::protocols::{Peers, Status, StatusCode};
-use crate::storage::db::StorageHighLevelOperations;
+use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations};
 use crate::storage::Storage;
 use crate::types::{Duration, Instant, RwLock};
 use crate::utils::network::prove_or_download_matched_blocks;

light-client-bin/src/tests/mod.rs

@@ -1,5 +1,5 @@
 use crate::protocols::{FilterProtocol, Status, StatusCode};
-use crate::storage::db::StorageHighLevelOperations;
+use crate::storage::db::{StorageGeneralOperations, StorageHighLevelOperations};
 use ckb_network::{BoxedCKBProtocolContext, PeerIndex};
 use ckb_types::{core::BlockNumber, packed, prelude::*};
 use log::{debug, trace};

light-client-bin/src/tests/service.rs

@@ -1,6 +1,6 @@
 use crate::protocols::FilterProtocol;
 use crate::protocols::{Status, StatusCode};
-use crate::storage::db::StorageHighLevelOperations;
+use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations};
 use crate::utils::network::prove_or_download_matched_blocks;
 use ckb_constant::sync::INIT_BLOCKS_IN_TRANSIT_PER_PEER;
 use ckb_network::{BoxedCKBProtocolContext, PeerIndex};

light-client-lib/src/protocols/filter/block_filter.rs

@@ -8,7 +8,7 @@ use ckb_types::{
 use log::{debug, error, info};
 use rand::seq::SliceRandom;
 
-use crate::storage::HeaderWithExtension;
+use crate::storage::{HeaderWithExtension, db::StorageBatchRelatedOperations};
 
 use super::{
     super::{LightClientProtocol, Status, StatusCode},