Skip to content

Commit

Permalink
added fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@itsHaseebSaeed
itsHaseebSaeed committed Oct 18, 2023
1 parent de126ba commit 225d8cd
Show file tree
Hide file tree
Showing 7 changed files with 164 additions and 173 deletions.
70 changes: 35 additions & 35 deletions contracts/liquidity_book/tests/src/multitests/lb_factory.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ pub fn test_setup() -> Result<(), anyhow::Error> {

//query getMaxFlashLoanFee
let max_flash_loan_fee =
lb_factory::query_max_flash_loan_fee(&mut app, &lb_factory.clone().into())?;
assert_eq!(max_flash_loan_fee, 1 * 10 ^ 17);
lb_factory::query_max_flash_loan_fee(&mut app, &lb_factory.into())?;
assert_eq!(max_flash_loan_fee, 10 ^ 17);
Ok(())
}

Expand All @@ -61,7 +61,7 @@ pub fn test_set_lb_pair_implementation() -> Result<(), anyhow::Error> {
lb_pair_stored_code.code_hash,
)?;
let lb_pair_code_info =
lb_factory::query_lb_pair_implementation(&mut app, &lb_factory.clone().into())?;
lb_factory::query_lb_pair_implementation(&mut app, &lb_factory.into())?;
assert_eq!(lb_pair_stored_code.code_id, lb_pair_code_info.id);

Ok(())
Expand All @@ -77,13 +77,13 @@ pub fn test_revert_set_lb_pair_implementation() -> Result<(), anyhow::Error> {
&mut app,
addrs.admin().as_str(),
&lb_factory.clone().into(),
lb_pair_stored_code.code_id.clone(),
lb_pair_stored_code.code_id,
lb_pair_stored_code.code_hash.clone(),
)?;
let err = lb_factory::set_lb_pair_implementation(
&mut app,
addrs.admin().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
lb_pair_stored_code.code_id,
lb_pair_stored_code.code_hash,
);
Expand Down Expand Up @@ -112,7 +112,7 @@ pub fn test_set_lb_token_implementation() -> Result<(), anyhow::Error> {
lb_token_stored_code.code_hash,
)?;
let lb_token_code_info =
lb_factory::query_lb_token_implementation(&mut app, &lb_factory.clone().into())?;
lb_factory::query_lb_token_implementation(&mut app, &lb_factory.into())?;
assert_eq!(lb_token_stored_code.code_id, lb_token_code_info.id);
Ok(())
}
Expand Down Expand Up @@ -152,16 +152,16 @@ pub fn test_create_lb_pair() -> Result<(), anyhow::Error> {
// 5. Get the LBPair information using `factory.getLBPairInformation`.
let lb_pair_info = lb_factory::query_lb_pair_information(
&mut app,
&lb_factory.clone().into(),
&lb_factory.into(),
token_x.clone(),
token_y.clone(),
DEFAULT_BIN_STEP,
)?;

assert_eq!(lb_pair_info, all_pairs[0]);
assert_eq!(lb_pair_info.bin_step, DEFAULT_BIN_STEP);
assert_eq!(lb_pair_info.created_by_owner, true);
assert_eq!(lb_pair_info.ignored_for_routing, false);
assert!(lb_pair_info.created_by_owner);
assert!(!lb_pair_info.ignored_for_routing);

// 6. Validate that the returned information matches the expected values (binStep, LBPair address, createdByOwner, ignoredForRouting).
//SORTED token
Expand Down Expand Up @@ -259,7 +259,7 @@ pub fn test_create_lb_pair_factory_unlocked() -> Result<(), anyhow::Error> {
token_y.clone(),
DEFAULT_BIN_STEP,
)?;
assert_eq!(lb_pair_info.created_by_owner, false);
assert!(!lb_pair_info.created_by_owner);

// close preset
// set open preset for bin_id
Expand All @@ -274,11 +274,11 @@ pub fn test_create_lb_pair_factory_unlocked() -> Result<(), anyhow::Error> {
let res = lb_factory::create_lb_pair(
&mut app,
addrs.scare_crow().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
DEFAULT_BIN_STEP,
ID_ONE,
token_x.clone(),
token_y.clone(),
token_x,
token_y,
"viewing_key".to_string(),
);
assert_eq!(
Expand All @@ -305,7 +305,7 @@ fn test_revert_create_lb_pair() -> Result<(), anyhow::Error> {
let res = lb_factory::create_lb_pair(
&mut app,
addrs.batman().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
DEFAULT_BIN_STEP,
ID_ONE,
token_x.clone(),
Expand All @@ -331,8 +331,8 @@ fn test_revert_create_lb_pair() -> Result<(), anyhow::Error> {
&new_lb_factory.clone().into(),
DEFAULT_BIN_STEP,
ID_ONE,
token_x.clone(),
token_y.clone(),
token_x,
token_y,
"viewing_key".to_string(),
);
//Check failing error
Expand Down Expand Up @@ -431,7 +431,7 @@ fn test_revert_create_lb_pair() -> Result<(), anyhow::Error> {
//Check failing error
assert_eq!(
res.unwrap_err(),
StdError::generic_err(format!("The LBPair implementation has not been set yet!",))
StdError::generic_err("The LBPair implementation has not been set yet!".to_string())
);

//can't create a pair the same pair twice
Expand Down Expand Up @@ -466,7 +466,7 @@ fn test_revert_create_lb_pair() -> Result<(), anyhow::Error> {
let res = lb_factory::create_lb_pair(
&mut app,
addrs.admin().as_str(),
&new_lb_factory.clone().into(),
&new_lb_factory.into(),
DEFAULT_BIN_STEP,
ID_ONE,
token_x.clone(),
Expand Down Expand Up @@ -548,7 +548,7 @@ fn test_fuzz_set_preset() -> Result<(), anyhow::Error> {
protocol_share_view,
max_volatility_accumulator_view,
is_open_view,
) = lb_factory::query_preset(&mut app, &lb_factory.clone().into(), bin_step)?;
) = lb_factory::query_preset(&mut app, &lb_factory.into(), bin_step)?;

assert_eq!(base_factor, base_factor_view);
assert_eq!(filter_period, filter_period_view);
Expand Down Expand Up @@ -632,7 +632,7 @@ fn test_remove_preset() -> Result<(), anyhow::Error> {
let res = lb_factory::remove_preset(
&mut app,
addrs.admin().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
DEFAULT_BIN_STEP,
);
assert!(
Expand Down Expand Up @@ -746,7 +746,7 @@ pub fn test_set_fees_parameters_on_pair() -> Result<(), anyhow::Error> {
let res = lb_factory::set_fees_parameters_on_pair(
&mut app,
addrs.batman().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
token_x,
token_y,
DEFAULT_BIN_STEP,
Expand All @@ -761,7 +761,7 @@ pub fn test_set_fees_parameters_on_pair() -> Result<(), anyhow::Error> {

assert_eq!(
res.unwrap_err(),
StdError::generic_err(format!("Only the Owner can do that!"))
StdError::generic_err("Only the Owner can do that!".to_string())
);

Ok(())
Expand Down Expand Up @@ -802,7 +802,7 @@ pub fn test_set_fee_recipient() -> Result<(), anyhow::Error> {
let err = lb_factory::set_fee_recipient(
&mut app,
addrs.admin().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
addrs.batman(),
);
assert_eq!(
Expand Down Expand Up @@ -834,10 +834,10 @@ pub fn test_fuzz_open_presets() -> Result<(), anyhow::Error> {
err.unwrap_err(),
StdError::generic_err(
StdError::GenericErr {
msg: String::from(format!(
msg: format!(
"Querier contract error: Bin step {} has no preset!",
bin_step
))
)
}
.to_string()
)
Expand Down Expand Up @@ -905,7 +905,7 @@ pub fn test_fuzz_open_presets() -> Result<(), anyhow::Error> {
let err = lb_factory::set_preset_open_state(
&mut app,
addrs.admin().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
bin_step,
false,
);
Expand Down Expand Up @@ -993,7 +993,7 @@ pub fn test_add_quote_asset() -> Result<(), anyhow::Error> {
let err = lb_factory::add_quote_asset(
&mut app,
addrs.admin().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
new_token.clone(),
);
assert_eq!(
Expand Down Expand Up @@ -1086,7 +1086,7 @@ pub fn test_remove_quote_asset() -> Result<(), anyhow::Error> {
let err = lb_factory::remove_quote_asset(
&mut app,
addrs.admin().as_str(),
&lb_factory.clone().into(),
&lb_factory.into(),
usdc.clone(),
);
assert_eq!(
Expand Down Expand Up @@ -1126,8 +1126,8 @@ pub fn test_force_decay() -> Result<(), anyhow::Error> {
let all_pairs = lb_factory::query_all_lb_pairs(
&mut app,
&lb_factory.clone().into(),
sscrt.clone(),
shd.clone(),
sscrt,
shd,
)?;

let lb_pair = all_pairs[0].clone().lb_pair;
Expand All @@ -1144,8 +1144,8 @@ pub fn test_force_decay() -> Result<(), anyhow::Error> {
let err = lb_factory::force_decay(
&mut app,
addrs.batman().as_str(),
&lb_factory.clone().into(),
lb_pair.clone(),
&lb_factory.into(),
lb_pair,
);
assert_eq!(
err.unwrap_err(),
Expand Down Expand Up @@ -1221,9 +1221,9 @@ pub fn test_get_all_lb_pair() -> Result<(), anyhow::Error> {

let all_pairs = lb_factory::query_all_lb_pairs(
&mut app,
&lb_factory.clone().into(),
token_x.clone(),
token_y.clone(),
&lb_factory.into(),
token_x,
token_y,
)?;

assert_eq!(all_pairs.len(), 2);
Expand Down
19 changes: 9 additions & 10 deletions contracts/liquidity_book/tests/src/multitests/lb_pair_fees.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ use shade_multi_test::interfaces::{
use shade_protocol::{
lb_libraries::{
math::{encoded_sample::MASK_UINT20, u24::U24},
tokens::SwapTokenAmount,
types::LBPairInformation,
},
liquidity_book::lb_pair::RemoveLiquidity,
multi_test::App,
};

pub const DEPOSIT_AMOUNT: u128 = 1_000_000_000_000_000_000 as u128;
pub const DEPOSIT_AMOUNT: u128 = 1_000_000_000_000_000_000_u128;

pub const ACTIVE_ID: u32 = ID_ONE;

Expand Down Expand Up @@ -54,16 +53,16 @@ pub fn lb_pair_setup() -> Result<
let all_pairs = lb_factory::query_all_lb_pairs(
&mut app,
&lb_factory.clone().into(),
token_x.clone(),
token_y.clone(),
token_x,
token_y,
)?;
let lb_pair = all_pairs[0].clone();

let lb_token = lb_pair::lb_token_query(&app, &lb_pair.lb_pair.contract)?;

lb_token::set_viewing_key(
&mut app,
&addrs.batman().as_str(),
addrs.batman().as_str(),
&lb_token,
"viewing_key".to_owned(),
)?;
Expand Down Expand Up @@ -140,7 +139,7 @@ pub fn lb_pair_setup() -> Result<

lb_pair::add_liquidity(
&mut app,
&addrs.batman().as_str(),
addrs.batman().as_str(),
&lb_pair.lb_pair.contract,
liquidity_parameters,
)?;
Expand Down Expand Up @@ -1404,7 +1403,7 @@ pub fn test_fee_x_2_lp() -> Result<(), anyhow::Error> {

lb_pair::add_liquidity(
&mut app,
&addrs.batman().as_str(),
addrs.batman().as_str(),
&lb_pair.lb_pair.contract,
liquidity_parameters,
)?;
Expand Down Expand Up @@ -1588,7 +1587,7 @@ pub fn test_fee_y_2_lp() -> Result<(), anyhow::Error> {

lb_pair::add_liquidity(
&mut app,
&addrs.batman().as_str(),
addrs.batman().as_str(),
&lb_pair.lb_pair.contract,
liquidity_parameters,
)?;
Expand Down Expand Up @@ -2188,8 +2187,8 @@ pub fn test_revert_total_fee_exceeded() -> Result<(), anyhow::Error> {
let all_pairs = lb_factory::query_all_lb_pairs(
&mut app,
&lb_factory.clone().into(),
token_x.clone(),
token_y.clone(),
token_x,
token_y,
)?;
let lb_pair = all_pairs[0].clone();
let base_factor = Uint128::from(generate_random(1u16, u16::MAX));
Expand Down
24 changes: 8 additions & 16 deletions contracts/liquidity_book/tests/src/multitests/lb_pair_initial_state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ pub fn lb_pair_setup(
let all_pairs = lb_factory::query_all_lb_pairs(
&mut app,
&lb_factory.clone().into(),
token_x.clone(),
token_y.clone(),
token_x,
token_y,
)?;
let lb_pair = all_pairs[0].clone();
Ok((app, lb_factory.into(), deployed_contracts, lb_pair))
Expand Down Expand Up @@ -237,7 +237,7 @@ pub fn test_query_oracle_sample_at() -> Result<(), anyhow::Error> {
#[test]
pub fn test_query_price_from_id() -> Result<(), anyhow::Error> {
let (app, _lb_factory, _deployed_contracts, lb_pair) = lb_pair_setup()?;
let delta = Uint256::from(DEFAULT_BIN_STEP).checked_mul(Uint256::from(5 * 10 ^ 13 as u128))?;
let delta = Uint256::from(DEFAULT_BIN_STEP).checked_mul(Uint256::from((5 * 10) ^ 13_u128))?;

assert_approx_eq_rel(
lb_pair::query_price_from_id(&app, &lb_pair.lb_pair.contract, 1_000 + ID_ONE)?,
Expand Down Expand Up @@ -283,7 +283,7 @@ pub fn test_query_price_from_id() -> Result<(), anyhow::Error> {
assert_approx_eq_rel(
lb_pair::query_price_from_id(&app, &lb_pair.lb_pair.contract, ID_ONE - 80_000)?,
Uint256::from_str("6392")?,
Uint256::from(10 ^ 8 as u128),
Uint256::from(10 ^ 8_u128),
"test_query_id_from_price::7",
);

Expand Down Expand Up @@ -406,12 +406,8 @@ pub fn test_query_id_from_price() -> Result<(), anyhow::Error> {
fn test_fuzz_query_swap_out() -> Result<(), anyhow::Error> {
let (app, _lb_factory, _deployed_contracts, lb_pair) = lb_pair_setup()?;

let amount_out: Uint128 = Uint128::from(generate_random(0, u128::MAX)).clone();
let swap_for_y: bool = if generate_random(0, 1) == 1 {
true
} else {
false
};
let amount_out: Uint128 = Uint128::from(generate_random(0, u128::MAX));
let swap_for_y: bool = generate_random(0, 1) == 1;

let (amount_in, amount_out_left, fee) =
lb_pair::query_swap_in(&app, &lb_pair.lb_pair.contract, amount_out, swap_for_y)?;
Expand All @@ -427,12 +423,8 @@ fn test_fuzz_query_swap_out() -> Result<(), anyhow::Error> {
fn test_fuzz_query_swap_in() -> Result<(), anyhow::Error> {
let (app, _lb_factory, _deployed_contracts, lb_pair) = lb_pair_setup()?;

let amount_in = Uint128::from(generate_random(0, u128::MAX)).clone();
let swap_for_y = if generate_random(0, 1) == 1 {
true
} else {
false
};
let amount_in = Uint128::from(generate_random(0, u128::MAX));
let swap_for_y = generate_random(0, 1) == 1;
let (amount_out, amount_in_left, fee) =
lb_pair::query_swap_out(&app, &lb_pair.lb_pair.contract, amount_in, swap_for_y)?;

Expand Down
Loading

0 comments on commit 225d8cd

Please sign in to comment.