Fix contracts

Author: chipshort

contracts/ibc-reflect/src/contract.rs

@@ -402,11 +402,13 @@ mod tests {
         let id = res.messages[0].id;
 
         // fake a reply and ensure this works
+        #[allow(deprecated)]
         let response = Reply {
             id,
             gas_used: 1234567,
             result: SubMsgResult::Ok(SubMsgResponse {
                 events: fake_events(&account),
+                msg_responses: vec![],
                 data: None,
             }),
         };
@@ -480,11 +482,13 @@ mod tests {
         assert_eq!(0, res.accounts.len());
 
         // fake a reply and ensure this works
+        #[allow(deprecated)]
         let response = Reply {
             id,
             gas_used: 1234567,
             result: SubMsgResult::Ok(SubMsgResponse {
                 events: fake_events(REFLECT_ADDR),
+                msg_responses: vec![],
                 data: None,
             }),
         };

contracts/ibc-reflect/tests/integration.rs

@@ -93,11 +93,13 @@ fn connect(
     let id = res.messages[0].id;
 
     // fake a reply and ensure this works
+    #[allow(deprecated)]
     let response = Reply {
         id,
         gas_used: 1234567,
         result: SubMsgResult::Ok(SubMsgResponse {
             events: fake_events(&account),
+            msg_responses: vec![],
             data: None,
         }),
     };
@@ -172,11 +174,13 @@ fn proper_handshake_flow() {
     assert_eq!(0, res.accounts.len());
 
     // we get the callback from reflect
+    #[allow(deprecated)]
     let response = Reply {
         id,
         gas_used: 1234567,
         result: SubMsgResult::Ok(SubMsgResponse {
             events: fake_events(REFLECT_ADDR),
+            msg_responses: vec![],
             data: None,
         }),
     };

contracts/reflect/src/contract.rs

@@ -435,9 +435,11 @@ mod tests {
         let data = Binary::from(b"foobar");
         let events = vec![Event::new("message").add_attribute("signer", "caller-addr")];
         let gas_used = 1234567u64;
+        #[allow(deprecated)]
         let result = SubMsgResult::Ok(SubMsgResponse {
             events: events.clone(),
             data: Some(data.clone()),
+            msg_responses: vec![],
         });
         let subcall = Reply {
             id,
@@ -460,7 +462,10 @@ mod tests {
         let qres: Reply = from_json(raw).unwrap();
         assert_eq!(qres.id, id);
         let result = qres.result.unwrap();
-        assert_eq!(result.data, Some(data));
+        #[allow(deprecated)]
+        {
+            assert_eq!(result.data, Some(data));
+        }
         assert_eq!(result.events, events);
     }
 }

contracts/reflect/tests/integration.rs

@@ -269,9 +269,11 @@ fn reply_and_query() {
     let data = Binary::from(b"foobar");
     let events = vec![Event::new("message").add_attribute("signer", "caller-addr")];
     let gas_used = 1234567u64;
+    #[allow(deprecated)]
     let result = SubMsgResult::Ok(SubMsgResponse {
         events: events.clone(),
         data: Some(data.clone()),
+        msg_responses: vec![],
     });
     let subcall = Reply {
         id,
@@ -290,6 +292,9 @@ fn reply_and_query() {
     let qres: Reply = from_json(raw).unwrap();
     assert_eq!(qres.id, id);
     let result = qres.result.unwrap();
-    assert_eq!(result.data, Some(data));
+    #[allow(deprecated)]
+    {
+        assert_eq!(result.data, Some(data));
+    }
     assert_eq!(result.events, events);
 }