test: update tests with new Pool struct

Cargo.toml

@@ -47,13 +47,13 @@ builds = [
 ]
 
 [dependencies]
-cosmwasm-std = "1.2.1"
+cosmwasm-std = "1.5.5"
 cosmwasm-schema = "1.2.1"
 apollo-cw-asset = "0.1.0"
 cw-controllers = "1.0.1"
-cw-dex = "0.5.1"
-cw-dex-astroport  = { version = "0.2.0-rc.1", optional = true}
-cw-dex-osmosis = { version = "0.1.0", optional = true} 
+cw-dex                  = { git = "https://github.com/apollodao/cw-dex.git", rev = "1bc26423607bfaee59d059e608c8460d42646291" }
+cw-dex-astroport        = { git = "https://github.com/apollodao/cw-dex.git", rev = "1bc26423607bfaee59d059e608c8460d42646291", optional = true }
+cw-dex-osmosis        = { git = "https://github.com/apollodao/cw-dex.git", rev = "1bc26423607bfaee59d059e608c8460d42646291", optional = true }
 cw-storage-plus = "1.0.1"
 cw2 = "1.0.1"
 cw20 = "1.0.1"
@@ -68,3 +68,4 @@ serde_json = "1.0.107"
 # Used in osmosis tests, should migrate to new cw-it at some point
 cw-it-old = { package = "cw-it", git = "https://github.com/apollodao/cw-it.git", rev = "1a3eea575ef82e71460db7296a9e0b5ffa98dcff" }
 osmosis-testing = { git = "https://github.com/apollodao/osmosis-rust", rev = "430236bd63f26d618e11e59709a56c808c4d427c" }
+

Makefile.toml

@@ -9,8 +9,8 @@ skip_core_tasks = true
 RUST_OPTIMIZER_VERSION = "0.15.0"
 # Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/rust-optimizer/blob/main/Dockerfile#L1)
 # to be sure that we compile / test against the same version
-RUST_VERSION = "1.75.0"
-NIGHTLY_VERSION = "nightly-2023-08-29"
+RUST_VERSION = "1.79.0"
+NIGHTLY_VERSION = "1.79.0"
 
 [tasks.install-stable]
 script = '''

tests/migrate_from_0_1_0.rs

@@ -2,10 +2,10 @@
 mod tests {
     use apollo_cw_asset::{AssetInfo, AssetInfoUnchecked, AssetUnchecked};
     use cosmwasm_std::{coin, Coin, Empty, Uint128};
-    use cw_dex::osmosis::OsmosisPool;
-    use cw_dex::Pool;
+    use cw_dex_osmosis::OsmosisPool;
     use cw_dex_router::msg::{ExecuteMsg, MigrateMsg};
     use cw_dex_router::operations::{SwapOperation, SwapOperationsList};
+    use cw_dex_router::pool::Pool;
     use cw_it::osmosis_std::types::cosmwasm::wasm::v1::{
         MsgMigrateContract, MsgMigrateContractResponse,
     };

tests/osmosis_tests.rs

@@ -13,9 +13,9 @@ mod osmosis_tests {
     use cosmwasm_std::{QuerierWrapper, StdError, StdResult, Uint128};
 
     use apollo_cw_asset::{AssetInfo, AssetInfoUnchecked};
-    use cw_dex::osmosis::OsmosisPool;
-    use cw_dex::Pool;
+    use cw_dex_osmosis::OsmosisPool;
     use cw_dex_router::msg::InstantiateMsg;
+    use cw_dex_router::pool::Pool;
 
     use cw_dex_router::operations::{SwapOperation, SwapOperationsList};