Fix vm tests

Author: chipshort

packages/vm/benches/main.rs

@@ -58,8 +58,13 @@ fn bench_instance(c: &mut Criterion) {
             let verifier = instance.api().addr_make("verifies");
             let beneficiary = instance.api().addr_make("benefits");
             let msg = format!(r#"{{"verifier": "{verifier}", "beneficiary": "{beneficiary}"}}"#);
-            let contract_result =
-                call_instantiate::<_, _, _, Empty>(&mut instance, &mock_env(), &info, msg).unwrap();
+            let contract_result = call_instantiate::<_, _, _, Empty>(
+                &mut instance,
+                &mock_env(),
+                &info,
+                msg.as_bytes(),
+            )
+            .unwrap();
             assert!(contract_result.into_result().is_ok());
         });
     });
@@ -77,7 +82,8 @@ fn bench_instance(c: &mut Criterion) {
         let beneficiary = instance.api().addr_make("benefits");
         let msg = format!(r#"{{"verifier": "{verifier}", "beneficiary": "{beneficiary}"}}"#);
         let contract_result =
-            call_instantiate::<_, _, _, Empty>(&mut instance, &mock_env(), &info, msg).unwrap();
+            call_instantiate::<_, _, _, Empty>(&mut instance, &mock_env(), &info, msg.as_bytes())
+                .unwrap();
         assert!(contract_result.into_result().is_ok());
 
         b.iter(|| {

packages/vm/src/calls.rs

@@ -934,7 +934,8 @@ mod tests {
         #[test]
         fn call_ibc_channel_close_works() {
             let mut instance = mock_instance(CONTRACT, &[]);
-            setup(&mut instance, CHANNEL_ID, ACCOUNT);
+            let account = instance.api().addr_make(ACCOUNT);
+            setup(&mut instance, CHANNEL_ID, &account);
             let handshake_close =
                 mock_ibc_channel_close_init(CHANNEL_ID, IbcOrder::Ordered, IBC_VERSION);
             call_ibc_channel_close::<_, _, _, Empty>(&mut instance, &mock_env(), &handshake_close)

packages/vm/src/testing/mock.rs

@@ -151,7 +151,7 @@ impl BackendApi for MockApi {
             MockApi::Bech32 { bech32_prefix } => *bech32_prefix,
         };
 
-        try_br!((validate_length(canonical.as_ref()), gas_info));
+        try_br!((validate_length(canonical), gas_info));
 
         let result = encode(bech32_prefix, canonical.to_base32(), Variant::Bech32)
             .map_err(|_| BackendError::user_err("Invalid canonical address"));
@@ -249,7 +249,7 @@ mod tests {
 
         // normalizes input
         let original = "JUNO1MEPRU9FUQ4E65856ARD6068MFSFRWPGEMD0C3R";
-        let canonical = api.canonical_address(&original).0.unwrap();
+        let canonical = api.canonical_address(original).0.unwrap();
         let recovered = api.human_address(&canonical).0.unwrap();
         assert_eq!(recovered, original.to_lowercase());