modification for rebase.

nervosnetwork · Dec 17, 2023 · 95fba3b · 95fba3b
1 parent 3d68e50
commit 95fba3b
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rpc/src/module/indexer_r.rs b/rpc/src/module/indexer_r.rs
@@ -1,11 +1,13 @@
 use crate::error::RPCError;
-use ckb_indexer_r::IndexerRHandle;
+use async_trait::async_trait;
+use ckb_indexer_r::AsyncIndexerRHandle;
 use ckb_jsonrpc_types::IndexerTip;
 use jsonrpc_core::Result;
-use jsonrpc_derive::rpc;
+use jsonrpc_utils::rpc;
 
 /// RPC Module Indexer.
-#[rpc(server)]
+#[rpc]
+#[async_trait]
 pub trait IndexerRRpc {
     /// Returns the indexed tip
     ///
@@ -38,23 +40,26 @@ pub trait IndexerRRpc {
     /// }
     /// ```
     #[rpc(name = "get_indexer_r_tip")]
-    fn get_indexer_r_tip(&self) -> Result<Option<IndexerTip>>;
+    async fn get_indexer_r_tip(&self) -> Result<Option<IndexerTip>>;
 }
 
+#[derive(Clone)]
 pub(crate) struct IndexerRRpcImpl {
-    pub(crate) handle: IndexerRHandle,
+    pub(crate) handle: AsyncIndexerRHandle,
 }
 
 impl IndexerRRpcImpl {
-    pub fn new(handle: IndexerRHandle) -> Self {
+    pub fn new(handle: AsyncIndexerRHandle) -> Self {
         IndexerRRpcImpl { handle }
     }
 }
 
+#[async_trait]
 impl IndexerRRpc for IndexerRRpcImpl {
-    fn get_indexer_r_tip(&self) -> Result<Option<IndexerTip>> {
+    async fn get_indexer_r_tip(&self) -> Result<Option<IndexerTip>> {
         self.handle
-            .get_indexer_tip()
+            .query_indexer_tip()
+            .await
             .map_err(|e| RPCError::custom(RPCError::Indexer, e))
     }
 }
diff --git a/rpc/src/service_builder.rs b/rpc/src/service_builder.rs
@@ -1,10 +1,11 @@
 #![allow(deprecated)]
 use crate::module::{
     add_alert_rpc_methods, add_chain_rpc_methods, add_debug_rpc_methods,
-    add_experiment_rpc_methods, add_indexer_rpc_methods, add_integration_test_rpc_methods,
-    add_miner_rpc_methods, add_net_rpc_methods, add_pool_rpc_methods, add_stats_rpc_methods,
-    add_subscription_rpc_methods, AlertRpcImpl, ChainRpcImpl, DebugRpcImpl, ExperimentRpcImpl,
-    IndexerRpcImpl, IntegrationTestRpcImpl, MinerRpcImpl, NetRpcImpl, PoolRpcImpl, StatsRpcImpl,
+    add_experiment_rpc_methods, add_indexer_r_rpc_methods, add_indexer_rpc_methods,
+    add_integration_test_rpc_methods, add_miner_rpc_methods, add_net_rpc_methods,
+    add_pool_rpc_methods, add_stats_rpc_methods, add_subscription_rpc_methods, AlertRpcImpl,
+    ChainRpcImpl, DebugRpcImpl, ExperimentRpcImpl, IndexerRRpcImpl, IndexerRpcImpl,
+    IntegrationTestRpcImpl, MinerRpcImpl, NetRpcImpl, PoolRpcImpl, StatsRpcImpl,
     SubscriptionRpcImpl,
 };
 use crate::{IoHandler, RPCError};
@@ -210,7 +211,7 @@ impl<'a> ServiceBuilder<'a> {
                 pool_service.index_tx_pool(shared.notify_controller().clone());
             }
         }
-        set_rpc_module_methods!(
+        self = set_rpc_module_methods!(
             self,
             "Indexer",
             indexer_enable,
@@ -225,7 +226,7 @@ impl<'a> ServiceBuilder<'a> {
             indexer_config,
             shared.async_handle().clone(),
         );
-        let indexer_r_handle = indexer_r.handle();
+        let indexer_r_handle = indexer_r.async_handle();
         let indexer_r_methods = IndexerRRpcImpl::new(indexer_r_handle);
         if self.config.indexer_r_enable() {
             indexer_r.spawn_poll(shared.notify_controller().clone());

diff --git a/util/indexer-r/src/indexer_handle/async_indexer_handle.rs b/util/indexer-r/src/indexer_handle/async_indexer_handle.rs
@@ -8,6 +8,7 @@ use sqlx::{any::AnyRow, Row};
 use std::sync::{Arc, RwLock};
 
 /// Async handle to the indexer-r.
+#[derive(Clone)]
 pub struct AsyncIndexerRHandle {
     store: SQLXPool,
     _pool: Option<Arc<RwLock<Pool>>>,

diff --git a/util/indexer-r/src/indexer_handle/mod.rs b/util/indexer-r/src/indexer_handle/mod.rs
@@ -14,6 +14,7 @@ use std::sync::{Arc, RwLock};
 ///
 /// The handle is internally reference-counted and can be freely cloned.
 /// A handle can be obtained using the IndexerRService::handle method.
+#[derive(Clone)]
 pub struct IndexerRHandle {
     async_handle: AsyncIndexerRHandle,
     async_runtime: Handle,