Upgrade MultiTest to version 0.20.1 (#410)

* Fixed failing tests. * Upgraded MultiTest to version 0.20.1 * Reformatted changed lines. * Reverted fixing tests, they pass in 1.68.0 toolchain.
astroport-fi · Mar 21, 2024 · 148930e · 148930e
1 parent 514d833
commit 148930e
Show file tree

Hide file tree

Showing 20 changed files with 95 additions and 317 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,3 @@ strip = true
 
 [patch.'https://github.com/astroport-fi/astroport-core']
 astroport = { path = "packages/astroport" }
-
-[patch.crates-io]
-cw-multi-test = { git = "https://github.com/astroport-fi/cw-multi-test.git", rev = "269a2c829d1ad25d67caa4600f72d2a21fb8fdeb" }
diff --git a/contracts/factory/Cargo.toml b/contracts/factory/Cargo.toml
@@ -35,7 +35,7 @@ cosmwasm-schema = "1.1"
 cw-utils = "1.0.1"
 
 [dev-dependencies]
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
 astroport-token = { path = "../token" }
 astroport-pair = { path = "../pair" }
 cw20 = "0.15"

diff --git a/contracts/pair_astro_xastro/Cargo.toml b/contracts/pair_astro_xastro/Cargo.toml
@@ -36,6 +36,6 @@ cosmwasm-schema = "1.1"
 [dev-dependencies]
 astroport-token = { path = "../token" }
 astroport-factory = { path = "../factory" }
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
 astroport-staking = { path = "../tokenomics/staking" }
 astroport-xastro-token = { path = "../tokenomics/xastro_token" }
diff --git a/contracts/pair_transmuter/Cargo.toml b/contracts/pair_transmuter/Cargo.toml
@@ -27,6 +27,6 @@ itertools = "0.12.0"
 anyhow = "1"
 derivative = "2"
 astroport-token = { path = "../token" }
-cw-multi-test = "0.20.0"
+cw-multi-test = "0.20.1"
 astroport-factory = { path = "../factory" }
-astroport-native-coin-registry = { path = "../periphery/native_coin_registry", version = "1" }
+astroport-native-coin-registry = { path = "../periphery/native_coin_registry", version = "1" }
diff --git a/contracts/periphery/fee_granter/Cargo.toml b/contracts/periphery/fee_granter/Cargo.toml
@@ -20,4 +20,4 @@ thiserror = "1"
 cw2 = "1.0.1"
 
 [dev-dependencies]
-cw-multi-test = { version="0.16.4", features=["stargate"] }
+cw-multi-test = "0.20.1"
diff --git a/contracts/periphery/fee_granter/tests/fee_granter_integration.rs b/contracts/periphery/fee_granter/tests/fee_granter_integration.rs
@@ -250,7 +250,7 @@ fn test_update_admins() {
     assert!(
         err.root_cause()
             .to_string()
-            .contains("Cannot execute Stargate"),
+            .contains("Unexpected stargate message"),
         "{err}"
     );
 

diff --git a/contracts/periphery/liquidity_manager/Cargo.toml b/contracts/periphery/liquidity_manager/Cargo.toml
@@ -22,7 +22,7 @@ astroport-pair-stable = { path = "../../pair_stable", features = ["library"], ve
 astroport-factory = { path = "../../factory", features = ["library"], version = "1" }
 
 [dev-dependencies]
-cw-multi-test = "0.16.4"
+cw-multi-test = "0.20.1"
 astroport-token = { path = "../../token" }
 astroport-native-coin-registry = { path = "../../periphery/native_coin_registry" }
 astroport-generator = { path = "../../tokenomics/generator" }

diff --git a/contracts/periphery/native-coin-wrapper/Cargo.toml b/contracts/periphery/native-coin-wrapper/Cargo.toml
@@ -34,5 +34,5 @@ thiserror = { version = "1.0" }
 astroport = { path = "../../../packages/astroport", version = "3" }
 
 [dev-dependencies]
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
 astroport-token = { path = "../../token" }
diff --git a/contracts/periphery/native_coin_registry/Cargo.toml b/contracts/periphery/native_coin_registry/Cargo.toml
@@ -31,4 +31,4 @@ thiserror = { version = "1.0" }
 astroport = { path = "../../../packages/astroport", version = "3" }
 
 [dev-dependencies]
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
diff --git a/contracts/periphery/oracle/Cargo.toml b/contracts/periphery/oracle/Cargo.toml
@@ -33,7 +33,7 @@ astroport-token = { path = "../../token" }
 astroport-factory = { path = "../../factory" }
 astroport-pair = { path = "../../pair" }
 astroport-pair-stable = { path = "../../pair_stable" }
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
 itertools = "0.10"
 anyhow = "1.0"
 astroport-native-coin-registry = { path = "../../periphery/native_coin_registry" }
diff --git a/contracts/router/Cargo.toml b/contracts/router/Cargo.toml
@@ -37,4 +37,4 @@ astroport-factory = { path = "../factory" }
 astroport-token = { path = "../token" }
 astroport-pair = { path = "../pair" }
 anyhow = "1.0"
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
diff --git a/contracts/tokenomics/incentives/Cargo.toml b/contracts/tokenomics/incentives/Cargo.toml
@@ -26,7 +26,7 @@ thiserror = "1"
 itertools = "0.11"
 
 [dev-dependencies]
-cw-multi-test = { git = "https://github.com/astroport-fi/cw-multi-test", branch = "astroport_cozy_fork" }
+cw-multi-test = "0.20.1"
 anyhow = "1"
 astroport-factory = { path = "../../factory" }
 astroport-pair = { path = "../../pair" }

diff --git a/contracts/tokenomics/incentives/tests/helper/helper.rs b/contracts/tokenomics/incentives/tests/helper/helper.rs
@@ -192,15 +192,24 @@ impl TestAddr {
 }
 
 impl AddressGenerator for TestAddr {
-    fn next_address(&self, storage: &mut dyn Storage) -> Addr {
+    fn contract_address(
+        &self,
+        _api: &dyn Api,
+        storage: &mut dyn Storage,
+        _code_id: u64,
+        _instance_id: u64,
+    ) -> AnyResult<Addr> {
         let count = if let Some(next) = storage.get(Self::COUNT_KEY) {
             u64::from_be_bytes(next.as_slice().try_into().unwrap()) + 1
         } else {
             1u64
         };
         storage.set(Self::COUNT_KEY, &count.to_be_bytes());
 
-        Addr::unchecked(format!("{}_contract{count}", Self::ADDR_PREFIX))
+        Ok(Addr::unchecked(format!(
+            "{}_contract{count}",
+            Self::ADDR_PREFIX
+        )))
     }
 }
 
@@ -229,9 +238,7 @@ pub struct Helper {
 impl Helper {
     pub fn new(owner: &str, astro: &AssetInfo) -> AnyResult<Self> {
         let mut app = AppBuilder::new()
-            .with_wasm::<FailingModule<_, _, Empty>, WasmKeeper<_, _>>(
-                WasmKeeper::new_with_custom_address_generator(TestAddr),
-            )
+            .with_wasm(WasmKeeper::new().with_address_generator(TestAddr))
             .with_api(TestApi::new())
             .with_block(BlockInfo {
                 height: 1,

diff --git a/contracts/tokenomics/maker/Cargo.toml b/contracts/tokenomics/maker/Cargo.toml
@@ -34,7 +34,7 @@ astro-satellite-package = { git = "https://github.com/astroport-fi/astroport_ibc
 astroport-token = { path = "../../token" }
 astroport-factory = { path = "../../factory" }
 astroport-pair = { path = "../../pair" }
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
 astroport-pair-stable = { path = "../../pair_stable" }
 astroport-governance = { git = "https://github.com/astroport-fi/astroport-governance" }
 astroport-escrow-fee-distributor = { git = "https://github.com/astroport-fi/astroport-governance" }

diff --git a/contracts/tokenomics/staking/Cargo.toml b/contracts/tokenomics/staking/Cargo.toml
@@ -33,4 +33,4 @@ cw-utils = "1.0.1"
 [dev-dependencies]
 astroport-token = { path = "../../token" }
 astroport-xastro-token = { path = "../../tokenomics/xastro_token" }
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
diff --git a/contracts/tokenomics/vesting/Cargo.toml b/contracts/tokenomics/vesting/Cargo.toml
@@ -23,5 +23,5 @@ cw-utils = "0.15"
 cosmwasm-schema = { version = "1.1", default-features = false }
 
 [dev-dependencies]
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
 astroport-token = { path = "../../token" }
diff --git a/contracts/tokenomics/xastro_outpost_token/Cargo.toml b/contracts/tokenomics/xastro_outpost_token/Cargo.toml
@@ -28,4 +28,4 @@ snafu = { version = "0.6" }
 cosmwasm-schema = "1.1"
 
 [dev-dependencies]
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
diff --git a/contracts/tokenomics/xastro_token/Cargo.toml b/contracts/tokenomics/xastro_token/Cargo.toml
@@ -28,4 +28,4 @@ snafu = { version = "0.6" }
 cosmwasm-schema = "1.1"
 
 [dev-dependencies]
-cw-multi-test = "0.15"
+cw-multi-test = "0.20.1"
diff --git a/packages/astroport_mocks/Cargo.toml b/packages/astroport_mocks/Cargo.toml
@@ -26,7 +26,7 @@ astroport-whitelist = { path = "../../contracts/whitelist" }
 astroport-xastro-token = { path = "../../contracts/tokenomics/xastro_token" }
 cosmwasm-schema = "1.2.5"
 cosmwasm-std = "1.2.5"
-cw-multi-test = { git = "https://github.com/astroport-fi/cw-multi-test.git", rev = "269a2c829d1ad25d67caa4600f72d2a21fb8fdeb" }
+cw-multi-test = "0.20.1"
 injective-cosmwasm = "0.2"
 schemars = "0.8.1"
 serde = "1.0"