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

Jump to bottom

test(exchange): resolve todos #207

Merged
merged 5 commits into from
Oct 27, 2021
Merged

test(exchange): resolve todos #207

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0efc13
resolve todos in exchange tests
Roznovjak Oct 22, 2021
48aad24
Merge branch 'master' into fix/tests
Roznovjak Oct 22, 2021
1119ea3
Merge branch 'master' into fix/tests
mrq1911 Oct 25, 2021
2ce019d
Merge branch 'master' into fix/tests
mrq1911 Oct 27, 2021
62e51b8
Merge branch 'master' into fix/tests
mrq1911 Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 36 additions & 22 deletions pallets/exchange/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ fn sell_test_pool_finalization_states() {
asset_a,
asset_b,
2_000_000_000_000,
20000000000,
20_000_000_000,
false,
));

Expand Down Expand Up @@ -270,15 +270,14 @@ fn sell_test_pool_finalization_states() {

// Check final account balances
assert_eq!(Currency::free_balance(asset_a, &user_2), 99_998_000_000_000_000);
assert_eq!(Currency::free_balance(asset_b, &user_2), 100003974296910891);
assert_eq!(Currency::free_balance(asset_b, &user_2), 100_003_974_296_910_891);

assert_eq!(Currency::free_balance(asset_a, &user_3), 100_001000000000000);
assert_eq!(Currency::free_balance(asset_b, &user_3), 99_997996000000000);
assert_eq!(Currency::free_balance(asset_a, &user_3), 100_001_000_000_000_000);
assert_eq!(Currency::free_balance(asset_b, &user_3), 99_997_996_000_000_000);

// Check final pool balances
// TODO: CHECK IF RIGHT
assert_eq!(Currency::free_balance(asset_a, &pair_account), 101000000000000);
assert_eq!(Currency::free_balance(asset_b, &pair_account), 198029703089109);
assert_eq!(Currency::free_balance(asset_a, &pair_account), 101_000_000_000_000);
assert_eq!(Currency::free_balance(asset_b, &pair_account), 198_029_703_089_109);

assert_eq!(Exchange::get_intentions_count((asset_b, asset_a)), 0);
});
Expand Down Expand Up @@ -329,17 +328,25 @@ fn sell_test_standard() {
<Exchange as OnFinalize<u64>>::on_finalize(9);

// Check final account balances -> SEEMS LEGIT
assert_eq!(Currency::free_balance(asset_a, &user_2), 99_998_000_000_000_000);
assert_eq!(Currency::free_balance(asset_b, &user_2), 100003974296910891);
let user_2_balance_a = Currency::free_balance(asset_a, &user_2);
let user_2_balance_b = Currency::free_balance(asset_b, &user_2);
assert_eq!(user_2_balance_a, 99_998_000_000_000_000);
assert_eq!(user_2_balance_b, 100003974296910891);

assert_eq!(Currency::free_balance(asset_a, &user_3), 100_001000000000000);
assert_eq!(Currency::free_balance(asset_b, &user_3), 99_997996000000000);
let user_3_balance_a = Currency::free_balance(asset_a, &user_3);
let user_3_balance_b = Currency::free_balance(asset_b, &user_3);
assert_eq!(user_3_balance_a, 100_001000000000000);
assert_eq!(user_3_balance_b, 99_997996000000000);

// Check final pool balances -> SEEMS LEGIT
assert_eq!(Currency::free_balance(asset_a, &pair_account), 101000000000000);
assert_eq!(Currency::free_balance(asset_b, &pair_account), 198029703089109);
let pool_balance_a = Currency::free_balance(asset_a, &pair_account);
let pool_balance_b = Currency::free_balance(asset_b, &pair_account);
assert_eq!(pool_balance_a, 101_000_000_000_000);
assert_eq!(pool_balance_b, 198_029_703_089_109);

assert_eq!(user_2_balance_a + user_3_balance_a + pool_balance_a, 200_100_000_000_000_000);
assert_eq!(user_2_balance_b + user_3_balance_b + pool_balance_b, 200_200_000_000_000_000);

// TODO: check if final transferred balances add up to initial balance
// No tokens should be created or lost
assert_eq!(Exchange::get_intentions_count((asset_b, asset_a)), 0);

Expand Down Expand Up @@ -461,17 +468,24 @@ fn sell_test_inverse_standard() {
<Exchange as OnFinalize<u64>>::on_finalize(9);

// Check final account balances -> SEEMS LEGIT
assert_eq!(Currency::free_balance(asset_a, &user_2), 99_999_000_000_000_000);
assert_eq!(Currency::free_balance(asset_b, &user_2), 100_001996000000000);
let user_2_balance_a = Currency::free_balance(asset_a, &user_2);
let user_2_balance_b = Currency::free_balance(asset_b, &user_2);
assert_eq!(user_2_balance_a, 99_999_000_000_000_000);
assert_eq!(user_2_balance_b, 100_001_996_000_000_000);

assert_eq!(Currency::free_balance(asset_a, &user_3), 100001986118811881);
assert_eq!(Currency::free_balance(asset_b, &user_3), 99_996_000_000_000_000);
let user_3_balance_a = Currency::free_balance(asset_a, &user_3);
let user_3_balance_b = Currency::free_balance(asset_b, &user_3);
assert_eq!(user_3_balance_a, 100_001_986_118_811_881);
assert_eq!(user_3_balance_b, 99_996_000_000_000_000);

// Check final pool balances -> SEEMS LEGIT
assert_eq!(Currency::free_balance(asset_a, &pair_account), 99_013_881_188_119);
assert_eq!(Currency::free_balance(asset_b, &pair_account), 202004000000000);
let pool_balance_a = Currency::free_balance(asset_a, &pair_account);
let pool_balance_b = Currency::free_balance(asset_b, &pair_account);
assert_eq!(pool_balance_a, 99_013_881_188_119);
assert_eq!(pool_balance_b, 202_004_000_000_000);

// TODO: check if final transferred balances add up to initial balance
assert_eq!(user_2_balance_a + user_3_balance_a + pool_balance_a, 200_100_000_000_000_000);
assert_eq!(user_2_balance_b + user_3_balance_b + pool_balance_b, 200_200_000_000_000_000);
// No tokens should be created or lost

assert_eq!(Exchange::get_intentions_count((asset_b, asset_a)), 0);
Expand Down Expand Up @@ -3367,7 +3381,7 @@ fn matching_limits_sell_buy_should_work() {
orml_tokens::Event::Reserved(asset_b, 2, 60000000000000).into(),
orml_tokens::Event::Reserved(asset_a, 3, 30000000000000).into(),
orml_tokens::Event::Reserved(asset_b, 2, 120000000000).into(),
orml_tokens::Event::Reserved(asset_b, 3, 60000000000).into(), //TODO: this is strange ?! should asset_a!!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Roznovjak can you elaborate on how this was resolved?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to be resolved in separate PR as a fix. But right now the test follows the current implementation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can u refer the issue pls

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#216

orml_tokens::Event::Reserved(asset_b, 3, 60000000000).into(),
xyk::Event::SellExecuted(
3,
asset_a,
Expand Down