Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/multitest #64

Merged
merged 6 commits into from
Nov 2, 2022
Merged

Feature/multitest #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ee315a
fix factory test
msivaklumachain Oct 31, 2022
d05aab1
fix merging issue
msivaklumachain Oct 31, 2022
4889c48
fix factory test
msivaklumachain Oct 31, 2022
44952db
fixing unit & integration testS
msivaklumachain Oct 31, 2022
fa83883
fix amm_pairs test
msivaklumachain Nov 1, 2022
a569c4c
Add get_reward_tokens
msivaklumachain Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion contracts/amm_pair/src/operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use shadeswap_shared::{
msg::{
amm_pair::{QueryMsgResponse, SwapInfo, SwapResult, TradeHistory},
factory::{QueryMsg as FactoryQueryMsg, QueryResponse as FactoryQueryResponse},
router::ExecuteMsg as RouterExecuteMsg,
staking::{InitMsg as StakingInitMsg, InvokeMsg as StakingInvokeMsg},
},
snip20::{
Expand Down
42 changes: 3 additions & 39 deletions contracts/amm_pair/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,7 @@ pub mod tests {
mk_custom_token_amount(Uint128::from(1000u128), &token_pair),
None
)?;
let offer_amount = &native_swap.clone().attributes[2];
assert_eq!(offer_amount.value, 65420.to_string());
assert_eq!(native_swap.messages.len(), 3);
assert_eq!(native_swap.messages.len(), 2);
Ok(())
}

Expand All @@ -221,44 +219,10 @@ pub mod tests {
mk_custom_token_amount(Uint128::from(1000u128), &token_pair),
None
)?;
let offer_amount = &native_swap.clone().attributes[2];
assert_eq!(offer_amount.value, 65420.to_string());
assert_eq!(native_swap.messages.len(), 2);
Ok(())
}

#[test]
fn assert_swap_native_snip20_with_router_without_signature_throws_error() -> StdResult<()> {
let mut deps = mock_dependencies(&[]);
let env = mock_custom_env(FACTORY_CONTRACT_ADDRESS);
let token_pair = mk_native_token_pair();
let config = make_init_config(mk_native_token_pair().clone())?;
let address_a = Addr::unchecked("TESTA".to_string());
let router_contract = Contract {
address: Addr::unchecked("router".to_string()),
code_hash: "".to_string(),
};
assert_eq!(
config.factory_contract.address.as_str(),
FACTORY_CONTRACT_ADDRESS.clone()
);
let native_swap = swap(
deps.as_mut(),
env,
config,
address_a.clone(),
None,
mk_custom_token_amount(Uint128::from(1000u128), &token_pair),
None,
);
match native_swap.unwrap_err() {
e => assert_eq!(e, StdError::generic_err(
"Callback signature needs to be passed with router contract.",
)),
}
Ok(())
}

#[test]
fn assert_get_estimated_lp_token_with_wrong_token_pair_throws_err() -> StdResult<()> {
let mut deps = mock_dependencies(&[]);
Expand Down Expand Up @@ -560,8 +524,8 @@ pub mod tests_calculation_price_and_fee {
Some(Uint128::from(400u128))
);
assert_eq!(
swap_and_test_slippage.unwrap().attributes[2].value,
1228.to_string());
swap_and_test_slippage.unwrap().messages.len(),
2);
Ok(())
}

Expand Down
39 changes: 20 additions & 19 deletions contracts/amm_pair/tests/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,21 @@ use shadeswap_shared::c_std::BlockInfo;
#[test]
pub fn amm_pair_integration_tests_with_custom_token() {
use amm_pair::contract::{instantiate, query, execute};
use multi_test::admin::admin_help::init_admin_contract;
use multi_test::help_lib::integration_help_lib::{roll_blockchain, mint_deposit_snip20, increase_allowance, store_init_factory_contract,
create_token_pair, convert_to_contract_link, send_snip20_with_msg, get_snip20_balance, set_viewing_key, get_amm_pair_config, get_pair_liquidity_pool_balance};
use cosmwasm_std::{Uint128, Coin, StdError, StdResult, Timestamp, from_binary, Api};
use multi_test::util_addr::util_addr::{OWNER, OWNER_SIGNATURE, OWNER_PUB_KEY, STAKER_A, STAKER_B, PUB_KEY_STAKER_A};
use shadeswap_shared::core::{ ContractInstantiationInfo, TokenPair, TokenPairAmount, TokenAmount, CustomFee, Fee};
use cosmwasm_std::{Uint128, Coin, Timestamp};
use multi_test::util_addr::util_addr::{OWNER};
use shadeswap_shared::core::{ ContractInstantiationInfo, TokenPairAmount, TokenAmount, CustomFee, Fee};
use shadeswap_shared::msg::amm_pair::InvokeMsg;
use shadeswap_shared::staking::StakingContractInit;
use shadeswap_shared::utils::testing::TestingExt;
use shadeswap_shared::{core::{TokenType}};
use multi_test::help_lib::integration_help_lib::{generate_snip20_contract};
use multi_test::help_lib::integration_help_lib::snip20_lp_token_contract_store;
use shadeswap_shared::Contract as SContract;
use multi_test::amm_pair::amm_pair_mock::amm_pair_mock::reply;
use staking::contract::{execute as staking_execute, instantiate as staking_instantiate, query as staking_query};
let staker_a_addr = Addr::unchecked(STAKER_A.to_owned());
let staker_b_addr = Addr::unchecked(STAKER_B.to_owned());
use multi_test::amm_pairs::amm_pairs_mock::amm_pairs_mock::reply;
use staking::contract::{execute as staking_execute, instantiate as staking_instantiate, query as staking_query};
let owner_addr = Addr::unchecked(OWNER);

let mut router = App::default();
Expand All @@ -42,7 +41,7 @@ pub fn amm_pair_integration_tests_with_custom_token() {

pub fn amm_contract_store() -> Box<dyn Contract<Empty>> {
let contract = ContractWrapper::new_with_empty(execute, instantiate, query)
.with_reply_empty(reply);
.with_reply(reply);
Box::new(contract)
}

Expand All @@ -62,10 +61,10 @@ pub fn amm_pair_integration_tests_with_custom_token() {
// MINT AND DEPOSIT FOR LIQUIDITY
mint_deposit_snip20(&mut router,&token_0_contract,&owner_addr,Uint128::new(10000000000u128), &owner_addr);
mint_deposit_snip20(&mut router,&token_1_contract,&owner_addr,Uint128::new(10000000000u128), &owner_addr);

let admin_contract = init_admin_contract(&mut router, &owner_addr).unwrap();
let lp_contract_info = router.store_code(snip20_lp_token_contract_store());
let staking_contract_info = router.store_code(staking_contract_store());
let factory_contract_info = store_init_factory_contract(&mut router).unwrap();
let factory_contract_info = store_init_factory_contract(&mut router, &convert_to_contract_link(&admin_contract)).unwrap();
let amm_pairs_info = router.store_code(amm_contract_store());
roll_blockchain(&mut router, 1).unwrap();

Expand All @@ -89,7 +88,7 @@ pub fn amm_pair_integration_tests_with_custom_token() {
factory_info: factory_link.to_owned(),
prng_seed: to_binary("seed").unwrap(),
entropy: to_binary("seed").unwrap(),
admin_auth: todo!(),
admin_auth: convert_to_contract_link(&admin_contract),
staking_contract: Some(StakingContractInit{
contract_info: ContractInstantiationInfo {
code_hash: staking_contract_info.code_hash.to_owned(),
Expand Down Expand Up @@ -118,7 +117,10 @@ pub fn amm_pair_integration_tests_with_custom_token() {

// Assert AMM PAIR Config
roll_blockchain(&mut router, 2).unwrap();
let query: QueryMsgResponse = router.query_test(amm_pair_contract.to_owned(),to_binary(&QueryMsg::GetConfig { }).unwrap()).unwrap();
let query: QueryMsgResponse = router.query_test(
amm_pair_contract.to_owned(),
to_binary(&QueryMsg::GetConfig { }).unwrap()
).unwrap();
match query {
QueryMsgResponse::GetConfig {
factory_contract,
Expand Down Expand Up @@ -321,6 +323,7 @@ pub fn amm_pair_integration_tests_with_custom_token() {
#[test]
pub fn amm_pair_integration_tests_native_token() {
use amm_pair::contract::{instantiate, query, execute};
use multi_test::admin::admin_help::init_admin_contract;
use multi_test::help_lib::integration_help_lib::{roll_blockchain, mint_deposit_snip20, increase_allowance, store_init_factory_contract, create_token_pair, convert_to_contract_link, send_snip20_with_msg, get_snip20_balance, set_viewing_key, get_amm_pair_config, get_pair_liquidity_pool_balance, create_token_pair_with_native};
use cosmwasm_std::{Uint128, Coin, Timestamp};
use multi_test::util_addr::util_addr::{OWNER, STAKER_A, STAKER_B};
Expand All @@ -332,11 +335,9 @@ pub fn amm_pair_integration_tests_native_token() {
use shadeswap_shared::{core::{TokenType}};
use multi_test::help_lib::integration_help_lib::{generate_snip20_contract};
use multi_test::help_lib::integration_help_lib::snip20_lp_token_contract_store;
use multi_test::amm_pair::amm_pair_mock::amm_pair_mock::reply;
use multi_test::amm_pairs::amm_pairs_mock::amm_pairs_mock::reply;
use shadeswap_shared::Contract as SContract;
use staking::contract::{execute as staking_execute, instantiate as staking_instantiate, query as staking_query};
let staker_a_addr = Addr::unchecked(STAKER_A.to_owned());
let staker_b_addr = Addr::unchecked(STAKER_B.to_owned());
use staking::contract::{execute as staking_execute, instantiate as staking_instantiate, query as staking_query};
let owner_addr = Addr::unchecked(OWNER);

let mut router = App::default();
Expand Down Expand Up @@ -371,10 +372,10 @@ pub fn amm_pair_integration_tests_native_token() {

// MINT AND DEPOSIT FOR LIQUIDITY
mint_deposit_snip20(&mut router,&token_0_contract,&owner_addr,Uint128::new(10000000000u128), &owner_addr);

let admin_contract = init_admin_contract(&mut router, &owner_addr).unwrap();
let lp_contract_info = router.store_code(snip20_lp_token_contract_store());
let staking_contract_info = router.store_code(staking_contract_store());
let factory_contract_info = store_init_factory_contract(&mut router).unwrap();
let factory_contract_info = store_init_factory_contract(&mut router, &convert_to_contract_link(&admin_contract)).unwrap();
let amm_pairs_info = router.store_code(amm_contract_store());
roll_blockchain(&mut router, 1).unwrap();

Expand All @@ -397,7 +398,7 @@ pub fn amm_pair_integration_tests_native_token() {
factory_info: factory_link.to_owned(),
prng_seed: to_binary("seed").unwrap(),
entropy: to_binary("seed").unwrap(),
admin_auth: todo!(),
admin_auth: convert_to_contract_link(&admin_contract),
staking_contract: Some(StakingContractInit{
contract_info: ContractInstantiationInfo {
code_hash: staking_contract_info.code_hash.to_owned(),
Expand Down
Loading