diff --git a/Cargo.lock b/Cargo.lock index 3ba1110d..97fec0bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "cw-multi-test" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561604d987be2ef3e34db1f01f0c98544106d84d8be2af92c0737bb199af452c" +checksum = "67fff029689ae89127cf6d7655809a68d712f3edbdb9686c70b018ba438b26ca" dependencies = [ "anyhow", "bech32", diff --git a/examples/Cargo.lock b/examples/Cargo.lock index c7d16915..dfec48bc 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "cw-multi-test" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561604d987be2ef3e34db1f01f0c98544106d84d8be2af92c0737bb199af452c" +checksum = "67fff029689ae89127cf6d7655809a68d712f3edbdb9686c70b018ba438b26ca" dependencies = [ "anyhow", "bech32", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 5d9d8ba5..c4b35794 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -29,7 +29,7 @@ edition = "2021" anyhow = "1.0.75" cosmwasm-schema = "1.5.0" cosmwasm-std = "1.5.0" -cw-multi-test = "0.19.0" +cw-multi-test = "0.20.0" cw-storage-plus = "1.2.0" cw-utils = "1.0.2" cw2 = "1.1.2" diff --git a/sylvia/Cargo.toml b/sylvia/Cargo.toml index a9d43912..b0da561e 100644 --- a/sylvia/Cargo.toml +++ b/sylvia/Cargo.toml @@ -14,28 +14,15 @@ categories = ["api-bindings", "wasm"] mt = ["sylvia-derive/mt", "dep:cw-multi-test", "dep:anyhow", "dep:derivative"] stargate = ["cosmwasm-std/stargate"] iterator = ["cosmwasm-std/iterator"] -cosmwasm_1_1 = [ - "dep:cw-multi-test", - "cosmwasm-std/cosmwasm_1_1", - "cw-multi-test?/cosmwasm_1_1", -] +cosmwasm_1_1 = ["cosmwasm-std/cosmwasm_1_1", "cw-multi-test?/cosmwasm_1_1"] cosmwasm_1_2 = [ - "dep:cw-multi-test", "cosmwasm-std/cosmwasm_1_2", "cw-multi-test?/cosmwasm_1_2", "dep:cw-utils", "sylvia-derive/cosmwasm_1_2", ] -cosmwasm_1_3 = [ - "dep:cw-multi-test", - "cosmwasm-std/cosmwasm_1_3", - "cw-multi-test?/cosmwasm_1_3", -] -cosmwasm_1_4 = [ - "dep:cw-multi-test", - "cosmwasm-std/cosmwasm_1_4", - "cw-multi-test?/cosmwasm_1_4", -] +cosmwasm_1_3 = ["cosmwasm-std/cosmwasm_1_3", "cw-multi-test?/cosmwasm_1_3"] +cosmwasm_1_4 = ["cosmwasm-std/cosmwasm_1_4", "cw-multi-test?/cosmwasm_1_4"] [dependencies] sylvia-derive = { workspace = true } @@ -46,14 +33,14 @@ serde = { version = "1.0", default-features = false, features = ["derive"] } serde-cw-value = "0.7.0" serde-json-wasm = "1.0.0" konst = "0.3" -cw-multi-test = { version = "0.19.0", optional = true } +cw-multi-test = { version = "0.20.0", optional = true } anyhow = { version = "1.0", optional = true } derivative = { version = "2.2.0", optional = true } cw-utils = { version = "1.0.2", optional = true } [dev-dependencies] anyhow = "1.0" -cw-multi-test = "0.19.0" +cw-multi-test = "0.20.0" cw-storage-plus = "1.2.0" cw-utils = "1.0.2" thiserror = "1.0.50" diff --git a/sylvia/src/multitest.rs b/sylvia/src/multitest.rs index c0fe0eac..312b4cde 100644 --- a/sylvia/src/multitest.rs +++ b/sylvia/src/multitest.rs @@ -2,14 +2,13 @@ use std::cell::{Ref, RefCell, RefMut}; use std::fmt::{Debug, Display}; use std::marker::PhantomData; -use cosmwasm_std::{ - Addr, Api, BlockInfo, Coin, CustomQuery, Empty, GovMsg, IbcMsg, IbcQuery, Storage, -}; +use cosmwasm_std::{Addr, Api, BlockInfo, Coin, CustomQuery, Empty, Storage}; #[cfg(feature = "cosmwasm_1_2")] use cosmwasm_std::{CodeInfoResponse, StdResult}; use cw_multi_test::{ - Bank, BankKeeper, Distribution, DistributionKeeper, Executor, FailingModule, Gov, Ibc, Module, - Router, StakeKeeper, Staking, Wasm, WasmKeeper, + Bank, BankKeeper, Distribution, DistributionKeeper, Executor, FailingModule, Gov, + GovFailingModule, Ibc, IbcFailingModule, Module, Router, StakeKeeper, Staking, StargateFailing, + Wasm, WasmKeeper, }; use schemars::JsonSchema; use serde::de::DeserializeOwned; @@ -41,8 +40,9 @@ impl App> { WasmKeeper, StakeKeeper, DistributionKeeper, - FailingModule, - FailingModule, + IbcFailingModule, + GovFailingModule, + StargateFailing, >, &dyn Api, &mut dyn Storage,