Replace subcall -> SubMsg::new

Author: ethanfrey

contracts/ibc-reflect/src/contract.rs

@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    attr, entry_point, from_slice, subcall, to_binary, wasm_execute, BankMsg, Binary,
+    attr, entry_point, from_slice, to_binary, wasm_execute, BankMsg, Binary,
     ContractResult, CosmosMsg, Deps, DepsMut, Empty, Env, Event, IbcAcknowledgement,
     IbcBasicResponse, IbcChannel, IbcOrder, IbcPacket, IbcReceiveResponse, MessageInfo, Order,
     QueryResponse, Reply, ReplyOn, Response, StdError, StdResult, SubMsg, SubcallResponse, WasmMsg,
@@ -163,7 +163,7 @@ pub fn ibc_channel_connect(
         funds: vec![],
         label: format!("ibc-reflect-{}", &chan_id),
     };
-    let msg = subcall(msg, INIT_CALLBACK_ID, ReplyOn::Success);
+    let msg = SubMsg::new(msg, INIT_CALLBACK_ID, ReplyOn::Success);
 
     // store the channel id for the reply handler
     pending_channel(deps.storage).save(&chan_id)?;
@@ -306,7 +306,7 @@ fn receive_dispatch(
     let wasm_msg = wasm_execute(reflect_addr, &reflect_msg, vec![])?;
 
     // we wrap it in a submessage to properly report errors
-    let msg = subcall(wasm_msg, RECEIVE_DISPATCH_ID, ReplyOn::Error);
+    let msg = SubMsg::new(wasm_msg, RECEIVE_DISPATCH_ID, ReplyOn::Error);
 
     Ok(IbcReceiveResponse {
         acknowledgement,

packages/std/src/lib.rs

@@ -52,9 +52,9 @@ pub use crate::query::{
 #[cfg(feature = "stargate")]
 pub use crate::query::{ChannelResponse, IbcQuery, ListChannelsResponse, PortIdResponse};
 pub use crate::results::{
-    attr, call, subcall, subcall_with_limit, wasm_execute, wasm_instantiate, Attribute, BankMsg,
-    ContractResult, CosmosMsg, Empty, Event, QueryResponse, Reply, ReplyOn, Response, SubMsg,
-    SubcallResponse, SystemResult, WasmMsg,
+    attr, call, wasm_execute, wasm_instantiate, Attribute, BankMsg, ContractResult, CosmosMsg,
+    Empty, Event, QueryResponse, Reply, ReplyOn, Response, SubMsg, SubcallResponse, SystemResult,
+    WasmMsg,
 };
 #[cfg(feature = "staking")]
 pub use crate::results::{DistributionMsg, StakingMsg};

packages/std/src/results/mod.rs

@@ -17,7 +17,5 @@ pub use cosmos_msg::{DistributionMsg, StakingMsg};
 pub use empty::Empty;
 pub use query::QueryResponse;
 pub use response::Response;
-pub use subcall::{
-    call, subcall, subcall_with_limit, Event, Reply, ReplyOn, SubMsg, SubcallResponse,
-};
+pub use subcall::{call, Event, Reply, ReplyOn, SubMsg, SubcallResponse};
 pub use system_result::SystemResult;

packages/std/src/results/subcall.rs

@@ -82,31 +82,33 @@ where
     }
 }
 
-/// subcall takes eg. BankMsg::Send{} and sets up for a reply. No gas limit is set.
-pub fn subcall<M, T>(msg: M, id: u64, reply_on: ReplyOn) -> SubMsg<T>
+impl<T> SubMsg<T>
 where
-    M: Into<CosmosMsg<T>>,
     T: Clone + fmt::Debug + PartialEq + JsonSchema,
 {
-    SubMsg {
-        id,
-        msg: msg.into(),
-        reply_on,
-        gas_limit: None,
+    /// new takes eg. BankMsg::Send{} and sets up for a reply. No gas limit is set.
+    pub fn new<M: Into<CosmosMsg<T>>>(msg: M, id: u64, reply_on: ReplyOn) -> Self {
+        SubMsg {
+            id,
+            msg: msg.into(),
+            reply_on,
+            gas_limit: None,
+        }
     }
-}
 
-/// subcall_with_limit is like subcall but allows setting a gas limit
-pub fn subcall_with_limit<M, T>(msg: M, id: u64, reply_on: ReplyOn, gas_limit: u64) -> SubMsg<T>
-where
-    M: Into<CosmosMsg<T>>,
-    T: Clone + fmt::Debug + PartialEq + JsonSchema,
-{
-    SubMsg {
-        id,
-        msg: msg.into(),
-        reply_on,
-        gas_limit: Some(gas_limit),
+    /// new_with_limit is like new but allows setting a gas limit
+    pub fn new_with_limit<M: Into<CosmosMsg<T>>>(
+        msg: M,
+        id: u64,
+        reply_on: ReplyOn,
+        gas_limit: u64,
+    ) -> Self {
+        SubMsg {
+            id,
+            msg: msg.into(),
+            reply_on,
+            gas_limit: Some(gas_limit),
+        }
     }
 }