diff --git a/Cargo. b/Cargo. deleted file mode 100644 index e69de29..0000000 diff --git a/cw-dex-astroport/src/pool.rs b/cw-dex-astroport/src/pool.rs index 2abaf3c..0db1c82 100644 --- a/cw-dex-astroport/src/pool.rs +++ b/cw-dex-astroport/src/pool.rs @@ -86,7 +86,7 @@ impl AstroportPool { .into_iter() .map(astroport_v5_assetinfo_to_assetinfo) .collect(), - pair_type: astroport_v5_pairtype_to_astroport_v3_pairtype(pair_info.pair_type), + pair_type: astroport_v5_pairtype_to_astroport_v2_pairtype(pair_info.pair_type), liquidity_manager, }) } @@ -513,7 +513,7 @@ pub fn asset_to_astroport_v5_asset(asset: &Asset) -> astroport_v5::asset::Asset } } -pub fn astroport_v5_pairtype_to_astroport_v3_pairtype( +pub fn astroport_v5_pairtype_to_astroport_v2_pairtype( pair_type: astroport_v5::factory::PairType, ) -> PairType { match pair_type { diff --git a/cw-dex-astroport/tests/astroport_tests.rs b/cw-dex-astroport/tests/astroport_tests.rs index c6d95db..d476e03 100644 --- a/cw-dex-astroport/tests/astroport_tests.rs +++ b/cw-dex-astroport/tests/astroport_tests.rs @@ -159,7 +159,6 @@ mod tests { // Provide liquidity with min_out one more than expected_out. Should fail. let unwrap = Unwrap::Err(error_msg); let min_out = expected_out + Uint128::new(1); - println!("min_out: {:?}", min_out); let provide_msg = ExecuteMsg::ProvideLiquidity { assets: asset_list.clone(), min_out, @@ -188,7 +187,6 @@ mod tests { // Query LP token balance after let lp_token_after = query_asset_balance(&runner, &lp_token, &contract_addr); - // bank_balance_query(&runner, contract_addr.clone(), lp_token_denom).unwrap(); assert_eq!(lp_token_after, expected_out); // Query asset balances in contract, assert that all were used @@ -382,16 +380,6 @@ mod tests { let lp_token_balance = bank_balance_query(&runner, admin.address().clone(), lp_token_denom.clone()).unwrap(); - // println!("admin_lp_token_balance: {:?}", lp_token_balance); - // // Send LP tokens to the test contract - // bank_send( - // &runner, - // admin, - // &contract_addr.clone(), - // coins(lp_token_balance.u128(), lp_token_denom.clone()), - // ) - // .unwrap(); - // Stake LP tokens let events = stake_all_lp_tokens( &runner, @@ -658,15 +646,6 @@ mod tests { .unwrap(); } - // Send LP tokens to the test contract - // bank_send( - // &runner, - // admin, - // &testing_contract_addr.clone(), - // coins(lp_token_balance.u128(), lp_token_denom.clone()), - // ) - // .unwrap(); - // Stake LP tokens let _events = stake_all_lp_tokens( &runner, diff --git a/test-helpers/src/astroport.rs b/test-helpers/src/astroport.rs index 6570fce..529ca7c 100644 --- a/test-helpers/src/astroport.rs +++ b/test-helpers/src/astroport.rs @@ -256,9 +256,6 @@ pub fn setup_pool_and_test_contract<'a>( let res = wasm .execute(&pair_addr, &provide_liq_msg, &native_coins, admin) .unwrap(); - println!("pair_addr: {}", pair_addr); - println!("admin: {}", admin.address()); - println!("provide liquidity res: {:?}", res); // Upload test contract wasm file let contract = match &runner {