Skip to content

Commit c38ecde

Browse files
mpsc0xmpsc0x
committed
fixed unit tests
1 parent 120a1d4 commit c38ecde

File tree

2 files changed

+40
-181
lines changed

2 files changed

+40
-181
lines changed

‎aave-core/tests/aave-pool/drop_reserve_remaining_assets_tests.move‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
130130
0
131131
);
132132

133+
supply_logic::set_user_use_reserve_as_collateral(
134+
user1, underlying_token_address, true
135+
);
136+
137+
supply_logic::set_user_use_reserve_as_collateral(
138+
user2, underlying_token_address, true
139+
);
140+
133141
// User2 borrows 500 tokens
134142
let borrow_amount = 500;
135143
borrow_logic::borrow(
@@ -409,6 +417,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
409417
0
410418
);
411419

420+
supply_logic::set_user_use_reserve_as_collateral(
421+
user1, underlying_token_address, true
422+
);
423+
424+
supply_logic::set_user_use_reserve_as_collateral(
425+
user2, underlying_token_address, true
426+
);
427+
412428
let borrow_amount = 500;
413429
borrow_logic::borrow(
414430
user2,
@@ -660,6 +676,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
660676
0
661677
);
662678

679+
supply_logic::set_user_use_reserve_as_collateral(
680+
user1, underlying_token_address, true
681+
);
682+
683+
supply_logic::set_user_use_reserve_as_collateral(
684+
user2, underlying_token_address, true
685+
);
686+
663687
let borrow_amount = 500;
664688
borrow_logic::borrow(
665689
user2,
@@ -911,6 +935,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
911935
0
912936
);
913937

938+
supply_logic::set_user_use_reserve_as_collateral(
939+
user1, underlying_token_address, true
940+
);
941+
942+
supply_logic::set_user_use_reserve_as_collateral(
943+
user2, underlying_token_address, true
944+
);
945+
914946
let borrow_amount = 500;
915947
borrow_logic::borrow(
916948
user2,
@@ -1163,6 +1195,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
11631195
0
11641196
);
11651197

1198+
supply_logic::set_user_use_reserve_as_collateral(
1199+
user1, underlying_token_address, true
1200+
);
1201+
1202+
supply_logic::set_user_use_reserve_as_collateral(
1203+
user2, underlying_token_address, true
1204+
);
1205+
11661206
let borrow_amount = 500;
11671207
borrow_logic::borrow(
11681208
user2,

‎aave-core/tests/aave-pool/pool_token_logic_tests.move‎

Lines changed: 0 additions & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,187 +1501,6 @@ module aave_pool::pool_token_logic_tests {
15011501
assert!(user2_balance == transfer_amount, TEST_SUCCESS);
15021502
}
15031503

1504-
#[
1505-
test(
1506-
aave_pool = @aave_pool,
1507-
aave_role_super_admin = @aave_acl,
1508-
aave_std = @std,
1509-
underlying_tokens_admin = @aave_mock_underlyings,
1510-
user1 = @0x41,
1511-
user2 = @0x42
1512-
)
1513-
]
1514-
// User 1 deposits 1000 U_1
1515-
// User 1 transfers 0 u1_a_token to user 2 (amount == 0 and sender != recipient)
1516-
fun test_transfer_when_amount_is_zero_and_sender_not_equal_recipient(
1517-
aave_pool: &signer,
1518-
aave_role_super_admin: &signer,
1519-
aave_std: &signer,
1520-
underlying_tokens_admin: &signer,
1521-
user1: &signer,
1522-
user2: &signer
1523-
) {
1524-
// start the timer
1525-
set_time_has_started_for_testing(aave_std);
1526-
1527-
let user1_address = signer::address_of(user1);
1528-
let user2_address = signer::address_of(user2);
1529-
create_account_for_test(user1_address);
1530-
create_account_for_test(user2_address);
1531-
1532-
init_reserves(
1533-
aave_pool,
1534-
aave_role_super_admin,
1535-
aave_std,
1536-
underlying_tokens_admin
1537-
);
1538-
1539-
let underlying_u1_token_address =
1540-
mock_underlying_token_factory::token_address(utf8(b"U_1"));
1541-
// user1 mint 1000 U_1
1542-
mock_underlying_token_factory::mint(
1543-
underlying_tokens_admin,
1544-
user1_address,
1545-
(convert_to_currency_decimals(underlying_u1_token_address, 1000) as u64),
1546-
underlying_u1_token_address
1547-
);
1548-
1549-
// user1 deposit 1000 U_1 to the pool
1550-
let supply_u1_amount =
1551-
convert_to_currency_decimals(underlying_u1_token_address, 1000);
1552-
supply_logic::supply(
1553-
user1,
1554-
underlying_u1_token_address,
1555-
supply_u1_amount,
1556-
user1_address,
1557-
0
1558-
);
1559-
1560-
let reserve_data = pool::get_reserve_data(underlying_u1_token_address);
1561-
let u1_a_token_address = pool::get_reserve_a_token_address(reserve_data);
1562-
let user1_balance = a_token_factory::balance_of(
1563-
user1_address, u1_a_token_address
1564-
);
1565-
assert!(user1_balance == supply_u1_amount, TEST_SUCCESS);
1566-
1567-
// user1 transfer 0 u1_a_token to user2
1568-
let transfer_amount = convert_to_currency_decimals(u1_a_token_address, 0);
1569-
pool_token_logic::transfer(
1570-
user1,
1571-
user2_address,
1572-
transfer_amount,
1573-
u1_a_token_address
1574-
);
1575-
1576-
// check BalanceTransfer emitted events
1577-
let balance_transfer_emitted_events = emitted_events<BalanceTransfer>();
1578-
// make sure event of type was emitted
1579-
assert!(vector::length(&balance_transfer_emitted_events) == 1, TEST_SUCCESS);
1580-
1581-
let user1_balance = a_token_factory::balance_of(
1582-
user1_address, u1_a_token_address
1583-
);
1584-
assert!(
1585-
user1_balance == supply_u1_amount - transfer_amount,
1586-
TEST_SUCCESS
1587-
);
1588-
let user2_balance = a_token_factory::balance_of(
1589-
user2_address, u1_a_token_address
1590-
);
1591-
assert!(user2_balance == transfer_amount, TEST_SUCCESS);
1592-
}
1593-
1594-
#[
1595-
test(
1596-
aave_pool = @aave_pool,
1597-
aave_role_super_admin = @aave_acl,
1598-
aave_std = @std,
1599-
underlying_tokens_admin = @aave_mock_underlyings,
1600-
user1 = @0x41,
1601-
user2 = @0x42
1602-
)
1603-
]
1604-
// User 1 deposits 1000 U_1
1605-
// User 1 transfers 0 u1_a_token to user 1 (amount == 0 and sender == recipient)
1606-
fun test_transfer_when_amount_is_zero_and_sender_equal_recipient(
1607-
aave_pool: &signer,
1608-
aave_role_super_admin: &signer,
1609-
aave_std: &signer,
1610-
underlying_tokens_admin: &signer,
1611-
user1: &signer,
1612-
user2: &signer
1613-
) {
1614-
// start the timer
1615-
set_time_has_started_for_testing(aave_std);
1616-
1617-
let user1_address = signer::address_of(user1);
1618-
let user2_address = signer::address_of(user2);
1619-
create_account_for_test(user1_address);
1620-
create_account_for_test(user2_address);
1621-
1622-
init_reserves(
1623-
aave_pool,
1624-
aave_role_super_admin,
1625-
aave_std,
1626-
underlying_tokens_admin
1627-
);
1628-
1629-
let underlying_u1_token_address =
1630-
mock_underlying_token_factory::token_address(utf8(b"U_1"));
1631-
// user1 mint 1000 U_1
1632-
mock_underlying_token_factory::mint(
1633-
underlying_tokens_admin,
1634-
user1_address,
1635-
(convert_to_currency_decimals(underlying_u1_token_address, 1000) as u64),
1636-
underlying_u1_token_address
1637-
);
1638-
1639-
// user1 deposit 1000 U_1 to the pool
1640-
let supply_u1_amount =
1641-
convert_to_currency_decimals(underlying_u1_token_address, 1000);
1642-
supply_logic::supply(
1643-
user1,
1644-
underlying_u1_token_address,
1645-
supply_u1_amount,
1646-
user1_address,
1647-
0
1648-
);
1649-
1650-
let reserve_data = pool::get_reserve_data(underlying_u1_token_address);
1651-
let u1_a_token_address = pool::get_reserve_a_token_address(reserve_data);
1652-
let user1_balance = a_token_factory::balance_of(
1653-
user1_address, u1_a_token_address
1654-
);
1655-
assert!(user1_balance == supply_u1_amount, TEST_SUCCESS);
1656-
1657-
// user1 transfer 0 u1_a_token to user1
1658-
let transfer_amount = convert_to_currency_decimals(u1_a_token_address, 0);
1659-
pool_token_logic::transfer(
1660-
user1,
1661-
user1_address,
1662-
transfer_amount,
1663-
u1_a_token_address
1664-
);
1665-
1666-
// check BalanceTransfer emitted events
1667-
let balance_transfer_emitted_events = emitted_events<BalanceTransfer>();
1668-
// make sure event of type was emitted
1669-
assert!(vector::length(&balance_transfer_emitted_events) == 1, TEST_SUCCESS);
1670-
1671-
let user1_balance = a_token_factory::balance_of(
1672-
user1_address, u1_a_token_address
1673-
);
1674-
assert!(
1675-
user1_balance == supply_u1_amount - transfer_amount,
1676-
TEST_SUCCESS
1677-
);
1678-
1679-
let user2_balance = a_token_factory::balance_of(
1680-
user2_address, u1_a_token_address
1681-
);
1682-
assert!(user2_balance == transfer_amount, TEST_SUCCESS);
1683-
}
1684-
16851504
#[
16861505
test(
16871506
aave_pool = @aave_pool,

0 commit comments

Comments
 (0)