Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
wojciech-cichocki committed Dec 15, 2023
1 parent b273684 commit 7501d8a
Showing 1 changed file with 14 additions and 32 deletions.
46 changes: 14 additions & 32 deletions src/e2e/position.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ fn test_remove_position() {
let upper_tick_index = 10;
let liquidity_delta = Liquidity::from_integer(1_000_000);

token_x.approve(invariant.address(), &U256::from(mint_amount));
token_y.approve(invariant.address(), &U256::from(mint_amount));
token_x.approve(invariant.address(), &mint_amount);
token_y.approve(invariant.address(), &mint_amount);

let pool_state = invariant
.get_pool(*token_x.address(), *token_y.address(), fee_tier)
Expand Down Expand Up @@ -311,8 +311,8 @@ fn test_position_within_current_tick() {
)
.unwrap();

token_x.approve(invariant.address(), &U256::from(initial_balance));
token_y.approve(invariant.address(), &U256::from(initial_balance));
token_x.approve(invariant.address(), &initial_balance);
token_y.approve(invariant.address(), &initial_balance);

let pool_key = PoolKey::new(*token_x.address(), *token_y.address(), fee_tier).unwrap();
let lower_tick_index = min_tick_test + 10;
Expand Down Expand Up @@ -388,14 +388,8 @@ fn test_position_within_current_tick() {
assert!(position_state.fee_growth_inside_y == zero_fee);

// Check balances
assert_eq!(
alice_x,
U256::from(initial_balance).checked_sub(dex_x).unwrap()
);
assert_eq!(
alice_y,
U256::from(initial_balance).checked_sub(dex_y).unwrap()
);
assert_eq!(alice_x, initial_balance.checked_sub(dex_x).unwrap());
assert_eq!(alice_y, initial_balance.checked_sub(dex_y).unwrap());
assert_eq!(dex_x, U256::from(expected_x_increase));
assert_eq!(dex_y, U256::from(expected_y_increase));
}
Expand Down Expand Up @@ -425,8 +419,8 @@ fn test_position_below_current_tick() {
)
.unwrap();

token_x.approve(invariant.address(), &U256::from(initial_balance));
token_y.approve(invariant.address(), &U256::from(initial_balance));
token_x.approve(invariant.address(), &initial_balance);
token_y.approve(invariant.address(), &initial_balance);

let pool_key = PoolKey::new(*token_x.address(), *token_y.address(), fee_tier).unwrap();
let lower_tick_index = -46080;
Expand Down Expand Up @@ -502,14 +496,8 @@ fn test_position_below_current_tick() {
assert!(position_state.fee_growth_inside_y == zero_fee);

// Check balances
assert_eq!(
alice_x,
U256::from(initial_balance).checked_sub(dex_x).unwrap()
);
assert_eq!(
alice_y,
U256::from(initial_balance).checked_sub(dex_y).unwrap()
);
assert_eq!(alice_x, initial_balance.checked_sub(dex_x).unwrap());
assert_eq!(alice_y, initial_balance.checked_sub(dex_y).unwrap());
assert_eq!(dex_x, U256::from(expected_x_increase));
assert_eq!(dex_y, U256::from(expected_y_increase));
}
Expand Down Expand Up @@ -539,8 +527,8 @@ fn test_position_above_current_tick() {
)
.unwrap();

token_x.approve(invariant.address(), &U256::from(initial_balance));
token_y.approve(invariant.address(), &U256::from(initial_balance));
token_x.approve(invariant.address(), &initial_balance);
token_y.approve(invariant.address(), &initial_balance);

let pool_key = PoolKey::new(*token_x.address(), *token_y.address(), fee_tier).unwrap();
let lower_tick_index = -22980;
Expand Down Expand Up @@ -601,14 +589,8 @@ fn test_position_above_current_tick() {
assert!(position_state.fee_growth_inside_y == zero_fee);

// Check balances
assert_eq!(
alice_x,
U256::from(initial_balance).checked_sub(dex_x).unwrap()
);
assert_eq!(
alice_y,
U256::from(initial_balance).checked_sub(dex_y).unwrap()
);
assert_eq!(alice_x, initial_balance.checked_sub(dex_x).unwrap());
assert_eq!(alice_y, initial_balance.checked_sub(dex_y).unwrap());
assert_eq!(dex_x, U256::from(expected_x_increase));
assert_eq!(dex_y, U256::from(expected_y_increase));
}

0 comments on commit 7501d8a

Please sign in to comment.