Fix contracts

Author: chipshort

contracts/burner/Cargo.toml

@@ -29,7 +29,7 @@ default = []
 cranelift = ["cosmwasm-vm/cranelift"]
 # for quicker tests, cargo test --lib
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/crypto-verify/Cargo.toml

@@ -29,7 +29,7 @@ default = []
 cranelift = ["cosmwasm-vm/cranelift"]
 # for quicker tests, cargo test --lib
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/crypto-verify/src/contract.rs

@@ -317,12 +317,13 @@ mod tests {
 
         let res = query(deps.as_ref(), mock_env(), verify_msg);
         assert!(res.is_err());
-        assert_eq!(
+        assert!(matches!(
             res.unwrap_err(),
             StdError::VerificationErr {
-                source: VerificationError::InvalidPubkeyFormat
+                source: VerificationError::InvalidPubkeyFormat,
+                ..
             }
-        )
+        ))
     }
 
     #[test]
@@ -605,12 +606,13 @@ mod tests {
         };
         let res = query(deps.as_ref(), mock_env(), verify_msg);
         assert!(res.is_err());
-        assert_eq!(
+        assert!(matches!(
             res.unwrap_err(),
             StdError::VerificationErr {
                 source: VerificationError::InvalidPubkeyFormat,
+                ..
             }
-        )
+        ))
     }
 
     #[test]
@@ -670,12 +672,13 @@ mod tests {
         };
         let res = query(deps.as_ref(), mock_env(), verify_msg);
         assert!(res.is_err());
-        assert_eq!(
+        assert!(matches!(
             res.unwrap_err(),
             StdError::VerificationErr {
-                source: VerificationError::InvalidPubkeyFormat
+                source: VerificationError::InvalidPubkeyFormat,
+                ..
             }
-        )
+        ))
     }
 
     #[test]

contracts/cyberpunk/Cargo.toml

@@ -26,7 +26,7 @@ default = []
 # Use cranelift backend instead of singlepass. This is required for development on 32 bit or ARM machines.
 cranelift = ["cosmwasm-vm/cranelift"]
 # For quicker tests, cargo test --lib. for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/empty/Cargo.toml

@@ -29,7 +29,7 @@ default = []
 cranelift = ["cosmwasm-vm/cranelift"]
 # for quicker tests, cargo test --lib
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/floaty/Cargo.toml

@@ -28,7 +28,7 @@ default = []
 # Use cranelift backend instead of singlepass. This is required for development on 32 bit or ARM machines.
 cranelift = ["cosmwasm-vm/cranelift"]
 # For quicker tests, cargo test --lib. for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/hackatom/Cargo.toml

@@ -28,7 +28,7 @@ default = []
 # Use cranelift backend instead of singlepass. This is required for development on 32 bit or ARM machines.
 cranelift = ["cosmwasm-vm/cranelift"]
 # For quicker tests, cargo test --lib. for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/ibc-reflect-send/Cargo.toml

@@ -29,7 +29,7 @@ default = []
 cranelift = ["cosmwasm-vm/cranelift"]
 # for quicker tests, cargo test --lib
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/ibc-reflect/Cargo.toml

@@ -29,7 +29,7 @@ default = []
 cranelift = ["cosmwasm-vm/cranelift"]
 # for quicker tests, cargo test --lib
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }

contracts/queue/Cargo.toml

@@ -28,7 +28,7 @@ default = []
 # Use cranelift backend instead of singlepass. This is required for development on 32 bit or ARM machines.
 cranelift = ["cosmwasm-vm/cranelift"]
 # For quicker tests, cargo test --lib. for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-vm/backtraces"]
 # this is to demonstrate conditional entry-points for cosmwasm-plus style
 library = []
 
@@ -40,4 +40,4 @@ schemars = "0.8.3"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
-cosmwasm-vm = { path = "../../packages/vm", default-features = false, features = ["iterator"]  }
+cosmwasm-vm = { path = "../../packages/vm", default-features = false, features = ["iterator"] }