diff --git a/Cargo.lock b/Cargo.lock index 3af1202..2efdb26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "apollo-cw-multi-test" -version = "0.19.0-rc.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c7f08fd29e20927635f8b976e9689f5b681bc8536f6b563bd8b728a606cc2c" +checksum = "c4d9d50055381538d90ed418227d5cf4906db896f5db26fd0a77e45aaa3f7fc7" dependencies = [ "anyhow", "cosmwasm-std", @@ -1100,9 +1100,9 @@ dependencies = [ [[package]] name = "cw-it" -version = "0.4.0-rc.8" +version = "0.4.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21068abf1b4e3835127f170ab5d0c20c543eab14c8472ffa1e1ba5fd9a541e4" +checksum = "e6838d7d4c7a2fb46d684fdac96fb3aac9bf660703456fe8b0046d751c17e975" dependencies = [ "anyhow", "apollo-cw-multi-test", diff --git a/Cargo.toml b/Cargo.toml index 5fda953..130e99b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,14 +26,14 @@ serde = { version = "1.0.145", default-features = false, features = ["derive"] } thiserror = { version = "1.0.31" } apollo-cw-asset = "0.1.1" osmosis-std = "0.22.0" -cw-it = { version = "0.4.0-rc.8", features = ["multi-test"]} +cw-it = { version = "0.4.0-rc.10", features = ["multi-test"]} apollo-utils = "0.1.0" astroport_v2 = { package = "astroport", version = "2.9.0" } astroport = { package = "astroport", version = "5.2.0" } test-case = "3.0.0" proptest = "1.0.0" cw-multi-test = "=1.2.0" -apollo-cw-multi-test = { version = "0.19.0-rc.1" ,features = ["stargate"] } +apollo-cw-multi-test = { version = "0.19.0" ,features = ["stargate"] } # Workspace packages cw-dex = { path = "cw-dex", version = "0.6.0-rc.4" } diff --git a/cw-dex-astroport/tests/astroport_tests.rs b/cw-dex-astroport/tests/astroport_tests.rs index 4e79cc5..cafa055 100644 --- a/cw-dex-astroport/tests/astroport_tests.rs +++ b/cw-dex-astroport/tests/astroport_tests.rs @@ -575,7 +575,7 @@ mod tests { // Create Cw20 tokens for each Cw20 incentive, mint incentive amount to // incentives_provider and add to incentives - let cw20_code_id = astroport_contracts.astro_token.code_id; + let cw20_code_id = astroport_contracts.astro_cw20_token.code_id; for (i, (amount, duration)) in cw20_incentives.iter().enumerate() { // Instantiate Cw20 token let cw20_addr = wasm diff --git a/test-helpers/src/astroport.rs b/test-helpers/src/astroport.rs index fb0b922..8e85b9b 100644 --- a/test-helpers/src/astroport.rs +++ b/test-helpers/src/astroport.rs @@ -96,7 +96,7 @@ pub fn setup_pool_and_test_contract<'a>( // Instantiate Apollo token (to have second CW20 to test CW20-CW20 pools) let apollo_token = instantiate_cw20( runner, - astroport_contracts.astro_token.code_id, + astroport_contracts.astro_cw20_token.code_id, &Cw20InstantiateMsg { name: "APOLLO".to_string(), symbol: "APOLLO".to_string(), @@ -117,7 +117,7 @@ pub fn setup_pool_and_test_contract<'a>( // Mint Astro tokens cw20_mint( runner, - astroport_contracts.clone().astro_token.address, + astroport_contracts.clone().astro_cw20_token.address, account.address().clone(), Uint128::from(1_000_000_000_000_000_000u128), admin, @@ -141,7 +141,7 @@ pub fn setup_pool_and_test_contract<'a>( asset_list .add(&Asset::new( AssetInfo::Cw20(Addr::unchecked( - astroport_contracts.clone().astro_token.address, + astroport_contracts.clone().astro_cw20_token.address, )), Uint128::new(amount.into()), )) @@ -283,7 +283,7 @@ pub fn setup_pool_and_test_contract<'a>( pair_addr.clone(), astroport_contracts.incentives.address.clone(), AssetInfo::cw20(Addr::unchecked( - astroport_contracts.astro_token.address.clone(), + astroport_contracts.astro_cw20_token.address.clone(), )), lp_token.clone(), liquidity_manager,