Fix integration tests

Author: aumetra

contracts/burner/tests/integration.rs

@@ -35,7 +35,7 @@ fn instantiate_fails() {
     let msg = res.unwrap_err();
     assert_eq!(
         msg,
-        "Generic error: You can only use this contract for migrations"
+        "kind: Other, error: You can only use this contract for migrations"
     );
 }
 

contracts/crypto-verify/tests/integration.rs

@@ -221,7 +221,7 @@ fn cosmos_signature_verify_errors() {
     let res = query(&mut deps, mock_env(), verify_msg);
     assert_eq!(
         res.unwrap_err(),
-        "Verification error: Invalid public key format"
+        "kind: Cryptography, error: Invalid public key format"
     )
 }
 
@@ -283,7 +283,7 @@ fn secp256r1_signature_verify_errors() {
     let res = query(&mut deps, mock_env(), verify_msg);
     assert_eq!(
         res.unwrap_err(),
-        "Verification error: Invalid public key format"
+        "kind: Cryptography, error: Invalid public key format"
     )
 }
 
@@ -354,7 +354,7 @@ fn ethereum_signature_verify_fails_for_corrupted_signature() {
     };
     let result = query(&mut deps, mock_env(), verify_msg);
     let msg = result.unwrap_err();
-    assert_eq!(msg, "Recover pubkey error: Unknown error: 10");
+    assert_eq!(msg, "kind: Cryptography, error: Unknown error: 10");
 }
 
 #[test]
@@ -466,7 +466,7 @@ fn tendermint_signature_verify_errors() {
     let res = query(&mut deps, mock_env(), verify_msg);
     assert_eq!(
         res.unwrap_err(),
-        "Verification error: Invalid public key format"
+        "kind: Cryptography, error: Invalid public key format"
     )
 }
 
@@ -625,7 +625,7 @@ fn tendermint_signatures_batch_verify_errors() {
     let res = query(&mut deps, mock_env(), verify_msg);
     assert_eq!(
         res.unwrap_err(),
-        "Verification error: Invalid public key format"
+        "kind: Cryptography, error: Invalid public key format"
     )
 }
 

contracts/hackatom/tests/integration.rs

@@ -97,7 +97,7 @@ fn instantiate_and_query() {
     // bad query returns parse error (pass wrong type - this connection is not enforced)
     let qres = query(&mut deps, mock_env(), ExecuteMsg::Panic {});
     let msg = qres.unwrap_err();
-    assert!(msg.contains("Error parsing"));
+    assert!(msg.contains("kind: Serialization"), "{msg}");
 }
 
 #[test]
@@ -178,7 +178,7 @@ fn fails_on_bad_init() {
     let res: ContractResult<Response> =
         instantiate(&mut deps, mock_env(), info, ExecuteMsg::Panic {});
     let msg = res.unwrap_err();
-    assert!(msg.contains("Error parsing"));
+    assert!(msg.contains("kind: Serialization"), "{msg}");
 }
 
 #[test]
@@ -407,7 +407,10 @@ fn execute_allocate_large_memory() {
         execute_info,
         ExecuteMsg::AllocateLargeMemory { pages: 1600 },
     );
-    assert_eq!(result.unwrap_err(), "Generic error: memory.grow failed");
+    assert_eq!(
+        result.unwrap_err(),
+        "kind: Other, error: memory.grow failed"
+    );
     let gas_used = gas_before - deps.get_gas_left();
     // Gas consumption is relatively small
     // Note: the exact gas usage depends on the Rust version used to compile Wasm,

contracts/nested-contracts/inner-contract/Cargo.lock

@@ -52,7 +52,7 @@ fn initialization_with_missing_validator() {
     let msg = res.unwrap_err();
     assert_eq!(
         msg,
-        "Generic error: my-validator is not in the current validator set"
+        "kind: Other, error: my-validator is not in the current validator set"
     );
 }