Update to non-option Cw20ReceiveMsg

CosmWasm · Apr 26, 2021 · 078b7f2 · 078b7f2
1 parent c4a4b12
commit 078b7f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/contracts/cw4-stake/schema/execute_msg.json b/contracts/cw4-stake/schema/execute_msg.json
@@ -136,21 +136,15 @@
       "type": "object",
       "required": [
         "amount",
+        "msg",
         "sender"
       ],
       "properties": {
         "amount": {
           "$ref": "#/definitions/Uint128"
         },
         "msg": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/Binary"
-            },
-            {
-              "type": "null"
-            }
-          ]
+          "$ref": "#/definitions/Binary"
         },
         "sender": {
           "type": "string"

diff --git a/contracts/cw4-stake/src/contract.rs b/contracts/cw4-stake/src/contract.rs
@@ -140,10 +140,7 @@ pub fn execute_receive(
     // wrapper.sender is the address of the user that requested the cw20 contract to send this.
     // This cannot be fully trusted (the cw20 contract can fake it), so only use it for actions
     // in the address's favor (like paying/bonding tokens, not withdrawls)
-    let msg: ReceiveMsg = match wrapper.msg {
-        Some(bin) => Ok(from_slice(&bin)?),
-        None => Err(ContractError::NoData {}),
-    }?;
+    let msg: ReceiveMsg = from_slice(&wrapper.msg)?;
     let balance = Balance::Cw20(Cw20CoinVerified {
         address: info.sender,
         amount: wrapper.amount,
@@ -463,7 +460,7 @@ mod tests {
                 let msg = ExecuteMsg::Receive(Cw20ReceiveMsg {
                     sender: addr.to_string(),
                     amount: Uint128(*stake),
-                    msg: Some(to_binary(&ReceiveMsg::Bond {}).unwrap()),
+                    msg: to_binary(&ReceiveMsg::Bond {}).unwrap(),
                 });
                 let info = mock_info(CW20_ADDRESS, &[]);
                 execute(deps.branch(), env.clone(), info, msg).unwrap();