Rename call -> msg in reflect

Author: uint

CHANGELOG.md

@@ -52,6 +52,8 @@ and this project adheres to
   attributes and instead constructs an empty one
 - cosmwasm-std: Rename `Event.kind` to `Event.ty`.
 - cosmwasm-std: Rename `SubcallResponse` to `SubMsgExecutionResponse`.
+- contracts: Rename `ReflectSubCall` to `ReflectSubMsg` and `SubCallResult` to
+  `SubCallMsg` in the `reflect` contract.
 
 [#961]: https://github.com/CosmWasm/cosmwasm/pull/961
 

contracts/reflect/schema/execute_msg.json

@@ -28,10 +28,10 @@
     {
       "type": "object",
       "required": [
-        "reflect_sub_call"
+        "reflect_sub_msg"
       ],
       "properties": {
-        "reflect_sub_call": {
+        "reflect_sub_msg": {
           "type": "object",
           "required": [
             "msgs"

contracts/reflect/schema/query_msg.json

@@ -82,13 +82,13 @@
       "additionalProperties": false
     },
     {
-      "description": "If there was a previous ReflectSubCall with this ID, returns cosmwasm_std::Reply",
+      "description": "If there was a previous ReflectSubMsg with this ID, returns cosmwasm_std::Reply",
       "type": "object",
       "required": [
-        "sub_call_result"
+        "sub_msg_result"
       ],
       "properties": {
-        "sub_call_result": {
+        "sub_msg_result": {
           "type": "object",
           "required": [
             "id"

contracts/reflect/src/contract.rs

@@ -30,7 +30,7 @@ pub fn execute(
 ) -> Result<Response<CustomMsg>, ReflectError> {
     match msg {
         ExecuteMsg::ReflectMsg { msgs } => try_reflect(deps, env, info, msgs),
-        ExecuteMsg::ReflectSubCall { msgs } => try_reflect_subcall(deps, env, info, msgs),
+        ExecuteMsg::ReflectSubMsg { msgs } => try_reflect_subcall(deps, env, info, msgs),
         ExecuteMsg::ChangeOwner { owner } => try_change_owner(deps, env, info, owner),
     }
 }
@@ -126,7 +126,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
         QueryMsg::Capitalized { text } => to_binary(&query_capitalized(deps, text)?),
         QueryMsg::Chain { request } => to_binary(&query_chain(deps, &request)?),
         QueryMsg::Raw { contract, key } => to_binary(&query_raw(deps, contract, key)?),
-        QueryMsg::SubCallResult { id } => to_binary(&query_subcall(deps, id)?),
+        QueryMsg::SubMsgResult { id } => to_binary(&query_subcall(deps, id)?),
     }
 }
 
@@ -415,7 +415,7 @@ mod tests {
             id,
         );
 
-        let msg = ExecuteMsg::ReflectSubCall {
+        let msg = ExecuteMsg::ReflectSubMsg {
             msgs: vec![payload.clone()],
         };
         let info = mock_info("creator", &[]);
@@ -449,12 +449,12 @@ mod tests {
         let qres = query(
             deps.as_ref(),
             mock_env(),
-            QueryMsg::SubCallResult { id: 65432 },
+            QueryMsg::SubMsgResult { id: 65432 },
         );
         assert!(qres.is_err());
 
         // query for the real id
-        let raw = query(deps.as_ref(), mock_env(), QueryMsg::SubCallResult { id }).unwrap();
+        let raw = query(deps.as_ref(), mock_env(), QueryMsg::SubMsgResult { id }).unwrap();
         let qres: Reply = from_binary(&raw).unwrap();
         assert_eq!(qres.id, id);
         let result = qres.result.unwrap();

contracts/reflect/src/msg.rs

@@ -10,7 +10,7 @@ pub struct InstantiateMsg {}
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     ReflectMsg { msgs: Vec<CosmosMsg<CustomMsg>> },
-    ReflectSubCall { msgs: Vec<SubMsg<CustomMsg>> },
+    ReflectSubMsg { msgs: Vec<SubMsg<CustomMsg>> },
     ChangeOwner { owner: String },
 }
 
@@ -31,8 +31,8 @@ pub enum QueryMsg {
         contract: String,
         key: Binary,
     },
-    /// If there was a previous ReflectSubCall with this ID, returns cosmwasm_std::Reply
-    SubCallResult {
+    /// If there was a previous ReflectSubMsg with this ID, returns cosmwasm_std::Reply
+    SubMsgResult {
         id: u64,
     },
 }

contracts/reflect/tests/integration.rs

@@ -204,7 +204,7 @@ fn reflect_subcall() {
         id,
     );
 
-    let msg = ExecuteMsg::ReflectSubCall {
+    let msg = ExecuteMsg::ReflectSubMsg {
         msgs: vec![payload.clone()],
     };
     let info = mock_info("creator", &[]);
@@ -235,11 +235,11 @@ fn reply_and_query() {
     assert_eq!(0, res.messages.len());
 
     // query for a non-existant id
-    let qres = query(&mut deps, mock_env(), QueryMsg::SubCallResult { id: 65432 });
+    let qres = query(&mut deps, mock_env(), QueryMsg::SubMsgResult { id: 65432 });
     assert!(qres.is_err());
 
     // query for the real id
-    let raw = query(&mut deps, mock_env(), QueryMsg::SubCallResult { id }).unwrap();
+    let raw = query(&mut deps, mock_env(), QueryMsg::SubMsgResult { id }).unwrap();
     let qres: Reply = from_binary(&raw).unwrap();
     assert_eq!(qres.id, id);
     let result = qres.result.unwrap();