refactor: MpoolPushMessage calling

ChainSafe · Apr 4, 2024 · 493c4a1 · 493c4a1
1 parent cd26918
commit 493c4a1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 38 deletions.
diff --git a/src/cli/subcommands/attach_cmd.rs b/src/cli/subcommands/attach_cmd.rs
@@ -7,10 +7,13 @@ use std::{
     str::FromStr,
 };
 
-use crate::chain::ChainEpochDelta;
 use crate::chain_sync::SyncStage;
 use crate::rpc_client::*;
 use crate::shim::{address::Address, message::Message};
+use crate::{
+    chain::ChainEpochDelta,
+    rpc::{self, mpool_api::MpoolPushMessage, RpcMethodExt as _},
+};
 use crate::{cli::humantoken, message::SignedMessage};
 use boa_engine::{
     object::{builtins::JsArray, FunctionObjectBuilder},
@@ -255,8 +258,11 @@ async fn send_message(params: SendMessageParams, api: ApiInfo) -> anyhow::Result
         Address::from_str(&to)?,
         humantoken::parse(&value)?, // Convert forest_shim::TokenAmount to TokenAmount3
     );
-
-    Ok(api.mpool_push_message(message, None).await?)
+    Ok(
+        MpoolPushMessage::call(&rpc::Client::from(api), (message.into(), None))
+            .await?
+            .into_inner(),
+    )
 }
 
 type SleepParams = (u64,);
@@ -344,9 +350,6 @@ impl AttachCommand {
                 "wallet_has"         => ApiInfo::wallet_has_req,
                 "wallet_set_default" => ApiInfo::wallet_set_default_req,
 
-                // Message Pool API
-                "mpool_push_message" => |(message, specs)| ApiInfo::mpool_push_message_req(message, specs),
-
                 // Common API
                 "version" => |()| ApiInfo::version_req(),
                 "shutdown" => |()| ApiInfo::shutdown_req(),

diff --git a/src/cli/subcommands/send_cmd.rs b/src/cli/subcommands/send_cmd.rs
@@ -3,6 +3,8 @@
 
 use std::str::FromStr as _;
 
+use crate::rpc::mpool_api::MpoolPushMessage;
+use crate::rpc::{self, RpcMethodExt as _};
 use crate::rpc_client::ApiInfo;
 use crate::shim::address::{Address, StrictAddress};
 use crate::shim::econ::TokenAmount;
@@ -53,7 +55,9 @@ impl SendCommand {
             ..Default::default()
         };
 
-        let signed_msg = api.mpool_push_message(message, None).await?;
+        let signed_msg = MpoolPushMessage::call(&rpc::Client::from(api), (message.into(), None))
+            .await?
+            .into_inner();
 
         println!("{}", signed_msg.cid().unwrap());
 

diff --git a/src/rpc/reflect/mod.rs b/src/rpc/reflect/mod.rs
@@ -189,6 +189,7 @@ pub trait RpcMethodExt<const ARITY: usize>: RpcMethod<ARITY> {
             }
         }
     }
+    /// Returns [`Err`] if any of the parameters fail to serialize.
     fn request(
         params: Self::Params,
     ) -> Result<crate::rpc_client::RpcRequest<Self::Ok>, serde_json::Error>
@@ -216,13 +217,11 @@ pub trait RpcMethodExt<const ARITY: usize>: RpcMethod<ARITY> {
         Self::Params: Serialize,
         Self::Ok: DeserializeOwned,
     {
-        // stay on current thread so don't require `Self::Params: Send`
-        let request = Self::request(params);
         async {
             // TODO(aatifsyed): https://github.com/ChainSafe/forest/issues/4032
             //                  Client::call has an inappropriate HasLotusJson
             //                  bound, work around it for now.
-            let json = client.call(request?.lower()).await?;
+            let json = client.call(Self::request(params)?.lower()).await?;
             Ok(serde_json::from_value(json)?)
         }
     }

diff --git a/src/rpc_client/mod.rs b/src/rpc_client/mod.rs
@@ -95,21 +95,15 @@ impl ApiInfo {
     //                  This function should return jsonrpsee::core::ClientError,
     //                  but that change should wait until _after_ all the methods
     //                  have been migrated.
+    //
+    //                  In the limit, only rpc::Client should be making calls,
+    //                  and ApiInfo should be removed.
     pub async fn call<T: HasLotusJson + std::fmt::Debug>(
         &self,
         req: RpcRequest<T>,
     ) -> Result<T, JsonRpcError> {
         use jsonrpsee::core::ClientError;
-        match rpc::Client::new(
-            multiaddr2url(&self.multiaddr).ok_or(JsonRpcError::internal_error(
-                "couldn't convert multiaddr to URL",
-                None,
-            ))?,
-            self.token.clone(),
-        )
-        .call(req)
-        .await
-        {
+        match rpc::Client::from(self.clone()).call(req).await {
             Ok(it) => Ok(it),
             Err(e) => match e {
                 ClientError::Call(it) => Err(it.into()),
@@ -119,6 +113,12 @@ impl ApiInfo {
     }
 }
 
+impl From<ApiInfo> for rpc::Client {
+    fn from(value: ApiInfo) -> Self {
+        rpc::Client::new(value.url, value.token)
+    }
+}
+
 /// An `RpcRequest` is an at-rest description of a remote procedure call. It can
 /// be invoked using `ApiInfo::call`.
 ///

diff --git a/src/rpc_client/mpool_ops.rs b/src/rpc_client/mpool_ops.rs
@@ -3,30 +3,13 @@
 
 use crate::{
     message::SignedMessage,
-    rpc::{mpool_api::*, types::MessageSendSpec, RpcMethod},
-    shim::message::Message,
+    rpc::{mpool_api::*, RpcMethod},
 };
 use cid::Cid;
 
 use super::{ApiInfo, JsonRpcError, RpcRequest};
 
 impl ApiInfo {
-    pub async fn mpool_push_message(
-        &self,
-        message: Message,
-        specs: Option<MessageSendSpec>,
-    ) -> Result<SignedMessage, JsonRpcError> {
-        self.call(Self::mpool_push_message_req(message, specs))
-            .await
-    }
-
-    pub fn mpool_push_message_req(
-        message: Message,
-        specs: Option<MessageSendSpec>,
-    ) -> RpcRequest<SignedMessage> {
-        RpcRequest::new(MpoolPushMessage::NAME, (message, specs))
-    }
-
     pub async fn mpool_pending(&self, cids: Vec<Cid>) -> Result<Vec<SignedMessage>, JsonRpcError> {
         self.call(Self::mpool_pending_req(cids)).await
     }