Skip to content

Commit

Permalink
fix integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@Roznovjak
Roznovjak committed Oct 2, 2024
1 parent a50ffb7 commit 1e209bb
Show file tree
Hide file tree
Showing 2 changed files with 254 additions and 82 deletions.
94 changes: 70 additions & 24 deletions integration-tests/src/referrals.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,18 +339,41 @@ fn buying_hdx_in_omnipool_should_transfer_correct_fee() {
u128::MAX,
));

expect_hydra_last_events(vec![pallet_omnipool::Event::BuyExecuted {
who: BOB.into(),
asset_in: DAI,
asset_out: HDX,
amount_in: 26_835_579_541_620_354,
amount_out: 1_000_000_000_000,
hub_amount_in: 1_209_746_177,
hub_amount_out: 1_209_141_304,
asset_fee_amount: 2_794_789_078,
protocol_fee_amount: 604_873,
}
.into()]);
expect_hydra_last_events(vec![
pallet_omnipool::Event::BuyExecuted {
who: BOB.into(),
asset_in: DAI,
asset_out: HDX,
amount_in: 26_835_579_541_620_354,
amount_out: 1_000_000_000_000,
hub_amount_in: 1_209_746_177,
hub_amount_out: 1_209_141_304,
asset_fee_amount: 2_794_789_078,
protocol_fee_amount: 604_873,
}
.into(),
pallet_omnipool::Event::HubAmountUpdated {
hub_amount_in: 1_209_746_177,
hub_amount_out: 1_209_141_304,
}
.into(),
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: Omnipool::protocol_account(),
filler_type: pallet_amm_support::Filler::Omnipool,
operation: pallet_amm_support::TradeOperation::Buy,
asset_in: DAI,
asset_out: HDX,
amount_in: 26_835_579_541_620_354,
amount_out: 1_000_000_000_000,
fees: vec![
(HDX, 2_794_789_078, Omnipool::protocol_account()),
(LRNA, 604_873, Omnipool::protocol_account()),
],
event_id: None,
}
.into(),
]);

let ref_dai_balance = Currencies::free_balance(DAI, &ref_account);
let staking_balance = Currencies::free_balance(HDX, &staking_acc);
Expand All @@ -376,18 +399,41 @@ fn buying_with_hdx_in_omnipool_should_transfer_correct_fee() {
u128::MAX,
));

expect_hydra_last_events(vec![pallet_omnipool::Event::BuyExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount_in: 37_506_757_329_085,
amount_out: 1_000_000_000_000_000_000,
hub_amount_in: 45_222_713_080,
hub_amount_out: 45_200_101_724,
asset_fee_amount: 2_644_977_450_514_458,
protocol_fee_amount: 22_611_356,
}
.into()]);
expect_hydra_last_events(vec![
pallet_omnipool::Event::BuyExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount_in: 37_506_757_329_085,
amount_out: 1_000_000_000_000_000_000,
hub_amount_in: 45_222_713_080,
hub_amount_out: 45_200_101_724,
asset_fee_amount: 2_644_977_450_514_458,
protocol_fee_amount: 22_611_356,
}
.into(),
pallet_omnipool::Event::HubAmountUpdated {
hub_amount_in: 45_222_713_080,
hub_amount_out: 45_200_101_724,
}
.into(),
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: Omnipool::protocol_account(),
filler_type: pallet_amm_support::Filler::Omnipool,
operation: pallet_amm_support::TradeOperation::Buy,
asset_in: HDX,
asset_out: DAI,
amount_in: 37_506_757_329_085,
amount_out: 1_000_000_000_000_000_000,
fees: vec![
(DAI, 2_644_977_450_514_458, Omnipool::protocol_account()),
(LRNA, 22_611_356, Omnipool::protocol_account()),
],
event_id: None,
}
.into(),
]);

let ref_dai_balance = Currencies::free_balance(DAI, &ref_account);
let staking_balance = Currencies::free_balance(HDX, &staking_acc);
Expand Down
242 changes: 184 additions & 58 deletions integration-tests/src/router.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2388,14 +2388,32 @@ mod omnipool_router_tests {
assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_out);

expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out,
event_id: 0,
}
.into()]);
expect_hydra_last_events(vec![
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: Omnipool::protocol_account(),
filler_type: pallet_amm_support::Filler::Omnipool,
operation: pallet_amm_support::TradeOperation::Sell,
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out,
fees: vec![
(DAI, 667155563986401, Omnipool::protocol_account()),
(LRNA, 6007435, Omnipool::protocol_account()),
],
event_id: Some(0),
}
.into(),
pallet_route_executor::Event::Executed {
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out,
event_id: 0,
}
.into(),
]);
});

TestNet::reset();
Expand All @@ -2414,18 +2432,41 @@ mod omnipool_router_tests {
));

//Assert
expect_hydra_last_events(vec![pallet_omnipool::Event::SellExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out,
hub_amount_in: 12014871681,
hub_amount_out: 12008864246,
asset_fee_amount: 667_155_563_986_401,
protocol_fee_amount: 6_007_435,
}
.into()]);
expect_hydra_last_events(vec![
pallet_omnipool::Event::SellExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out,
hub_amount_in: 12014871681,
hub_amount_out: 12008864246,
asset_fee_amount: 667_155_563_986_401,
protocol_fee_amount: 6_007_435,
}
.into(),
pallet_omnipool::Event::HubAmountUpdated {
hub_amount_in: 12014871681,
hub_amount_out: 12008864246,
}
.into(),
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: Omnipool::protocol_account(),
filler_type: pallet_amm_support::Filler::Omnipool,
operation: pallet_amm_support::TradeOperation::Sell,
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out,
fees: vec![
(DAI, 667155563986401, Omnipool::protocol_account()),
(LRNA, 6007435, Omnipool::protocol_account()),
],
event_id: None,
}
.into(),
]);

assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_out);
Expand Down Expand Up @@ -2570,14 +2611,32 @@ mod omnipool_router_tests {
assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_in);
assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);

expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
asset_in: HDX,
asset_out: DAI,
amount_in,
amount_out: amount_to_buy,
event_id: 0,
}
.into()]);
expect_hydra_last_events(vec![
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: Omnipool::protocol_account(),
filler_type: pallet_amm_support::Filler::Omnipool,
operation: pallet_amm_support::TradeOperation::Buy,
asset_in: HDX,
asset_out: DAI,
amount_in,
amount_out: amount_to_buy,
fees: vec![
(DAI, 2506265665, Omnipool::protocol_account()),
(LRNA, 22, Omnipool::protocol_account()),
],
event_id: Some(0),
}
.into(),
pallet_route_executor::Event::Executed {
asset_in: HDX,
asset_out: DAI,
amount_in,
amount_out: amount_to_buy,
event_id: 0,
}
.into(),
]);
});

TestNet::reset();
Expand All @@ -2596,18 +2655,41 @@ mod omnipool_router_tests {
));

//Assert
expect_hydra_last_events(vec![pallet_omnipool::Event::BuyExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount_in,
amount_out: amount_to_buy,
hub_amount_in: 45135,
hub_amount_out: 45113,
asset_fee_amount: 2_506_265_665,
protocol_fee_amount: 22,
}
.into()]);
expect_hydra_last_events(vec![
pallet_omnipool::Event::BuyExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount_in,
amount_out: amount_to_buy,
hub_amount_in: 45135,
hub_amount_out: 45113,
asset_fee_amount: 2_506_265_665,
protocol_fee_amount: 22,
}
.into(),
pallet_omnipool::Event::HubAmountUpdated {
hub_amount_in: 45135,
hub_amount_out: 45113,
}
.into(),
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: Omnipool::protocol_account(),
filler_type: pallet_amm_support::Filler::Omnipool,
operation: pallet_amm_support::TradeOperation::Buy,
asset_in: HDX,
asset_out: DAI,
amount_in,
amount_out: amount_to_buy,
fees: vec![
(DAI, 2_506_265_665, Omnipool::protocol_account()),
(LRNA, 22, Omnipool::protocol_account()),
],
event_id: None,
}
.into(),
]);

assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_in);
assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
Expand Down Expand Up @@ -2877,14 +2959,37 @@ mod lbp_router_tests {
assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + received_amount_out);

expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out: received_amount_out,
event_id: 0,
}
.into()]);
let fee = 20000000000;

expect_hydra_last_events(vec![
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: LBP::get_pair_id(pallet_lbp::types::AssetPair::new(DAI, HDX)),
filler_type: pallet_amm_support::Filler::LBP,
operation: pallet_amm_support::TradeOperation::Sell,
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell - fee,
amount_out: received_amount_out,
fees: vec![(
HDX,
fee,
LBP::pool_data(LBP::get_pair_id(pallet_lbp::types::AssetPair::new(HDX, DAI)))
.unwrap()
.fee_collector,
)],
event_id: Some(0),
}
.into(),
pallet_route_executor::Event::Executed {
asset_in: HDX,
asset_out: DAI,
amount_in: amount_to_sell,
amount_out: received_amount_out,
event_id: 0,
}
.into(),
]);
});

TestNet::reset();
Expand All @@ -2904,16 +3009,37 @@ mod lbp_router_tests {
));

//Assert
expect_hydra_last_events(vec![pallet_lbp::Event::SellExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount: 9_980_000_000_000,
sale_price: received_amount_out,
fee_asset: HDX,
fee_amount: 20_000_000_000,
}
.into()]);
expect_hydra_last_events(vec![
pallet_lbp::Event::SellExecuted {
who: BOB.into(),
asset_in: HDX,
asset_out: DAI,
amount: 9_980_000_000_000,
sale_price: received_amount_out,
fee_asset: HDX,
fee_amount: 20_000_000_000,
}
.into(),
pallet_amm_support::Event::Swapped {
swapper: BOB.into(),
filler: LBP::get_pair_id(pallet_lbp::types::AssetPair::new(DAI, HDX)),
filler_type: pallet_amm_support::Filler::LBP,
operation: pallet_amm_support::TradeOperation::Sell,
asset_in: HDX,
asset_out: DAI,
amount_in: 9_980_000_000_000,
amount_out: received_amount_out,
fees: vec![(
HDX,
20_000_000_000,
LBP::pool_data(LBP::get_pair_id(pallet_lbp::types::AssetPair::new(HDX, DAI)))
.unwrap()
.fee_collector,
)],
event_id: None,
}
.into(),
]);

assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + received_amount_out);
Expand Down

0 comments on commit 1e209bb

Please sign in to comment.