Skip to content

Commit 60e005c

Browse files
craterface77Haypierre
authored andcommitted
Test: Adjusted AaveVaultFork.t.sol to have the ability to run L2 networks
1 parent fcab292 commit 60e005c

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

script/deployChainAbstractionSetup.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ contract DeployChainAbstractionSetup is Script, CheckOrDeployEntryPoint, CheckAa
8787
vaultManager.addVault(baseVault);
8888

8989
if (isAaveToken(protocolDataProvider, token)) {
90-
if(isL2) {
90+
if (isL2) {
9191
l2Encoder = address(new L2Encoder(IPool(aavePool)));
9292
} else {
9393
l2Encoder = address(0);

test/AaveVault/AaveVaultFork.t.sol

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {IPool} from "aave-v3-origin/core/contracts/interfaces/IPool.sol";
1111
import {InvoiceManager} from "../../src/core/InvoiceManager.sol";
1212
import {IVault} from "../../src/interfaces/IVault.sol";
1313
import {CheckAaveTokenStatus} from "../../script/auxiliary/checkAaveTokenStatus.s.sol";
14+
import {L2Encoder} from "aave-v3-origin/core/contracts/misc/L2Encoder.sol";
1415

1516
contract DeployAndTestAaveVaults is Test, Script, CheckAaveTokenStatus {
1617
VaultManager internal vaultManager;
@@ -19,6 +20,7 @@ contract DeployAndTestAaveVaults is Test, Script, CheckAaveTokenStatus {
1920
IERC20 internal underlyingToken;
2021
IERC20 internal aToken;
2122
address internal deployer;
23+
address internal l2Encoder;
2224

2325
bool internal isL2 = vm.envBool("IS_L2");
2426
address internal owner = vm.envAddress("OWNER");
@@ -41,6 +43,11 @@ contract DeployAndTestAaveVaults is Test, Script, CheckAaveTokenStatus {
4143
);
4244

4345
if (isAaveToken(protocolDataProvider, address(underlyingToken))) {
46+
if (isL2) {
47+
l2Encoder = address(new L2Encoder(IPool(aavePool)));
48+
} else {
49+
l2Encoder = address(0);
50+
}
4451
address aTokenAddress = getATokenAddress(protocolDataProvider, address(underlyingToken));
4552
aToken = IERC20(aTokenAddress);
4653
aaveVault = AaveVault(
@@ -53,8 +60,8 @@ contract DeployAndTestAaveVaults is Test, Script, CheckAaveTokenStatus {
5360
underlyingToken,
5461
aToken,
5562
IPool(aavePool),
56-
false,
57-
address(0)
63+
isL2,
64+
l2Encoder
5865
)
5966
)
6067
)
@@ -272,7 +279,6 @@ contract DeployAndTestAaveVaults is Test, Script, CheckAaveTokenStatus {
272279
uint256 depositA = 100 * 10 ** 18;
273280
uint256 depositB = 200 * 10 ** 18;
274281

275-
276282
// User A deposits
277283
vm.startPrank(owner);
278284
vaultManager.addVault(aaveVault);

test/AaveVault/Deposit.t.sol

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ contract DepositTest is Test {
8888
assertEq(mockUnderlyingToken.balanceOf(address(mockAavePool)), depositAmount, "Pool balance mismatch");
8989
assertEq(mockUnderlyingToken.balanceOf(address(aaveVaultL1)), 0, "Vault balance mismatch");
9090
assertEq(
91-
vaultManager.vaultShares(alice, aaveVaultL1), aaveVaultL1.underlyingToShares(depositAmount), "Shares mismatch"
91+
vaultManager.vaultShares(alice, aaveVaultL1),
92+
aaveVaultL1.underlyingToShares(depositAmount),
93+
"Shares mismatch"
9294
);
9395
}
9496

@@ -104,7 +106,11 @@ contract DepositTest is Test {
104106
assertEq(mockUnderlyingToken.balanceOf(address(mockL2AavePool)), depositAmount, "Pool balance mismatch");
105107
assertEq(mockUnderlyingToken.balanceOf(address(aaveVaultL1)), 0, "Vault balance mismatch");
106108
// Verify shares
107-
assertEq(vaultManager.vaultShares(alice, aaveVaultL2), aaveVaultL2.underlyingToShares(depositAmount), "Shares mismatch");
109+
assertEq(
110+
vaultManager.vaultShares(alice, aaveVaultL2),
111+
aaveVaultL2.underlyingToShares(depositAmount),
112+
"Shares mismatch"
113+
);
108114
}
109115

110116
function testDepositFailsWithoutApproval() public {

test/AaveVault/Withdraw.t.sol

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,11 @@ contract WithdrawTest is Test {
111111

112112
// Verify balances
113113
assertEq(mockUnderlyingToken.balanceOf(alice), 900 ether, "Alice did not receive correct L1 withdrawal amount");
114-
assertEq(vaultManager.vaultShares(alice, aaveVaultL1), aaveVaultL1.totalShares() - sharesWithdrawAmount, "Shares mismatch after L1 withdrawal");
114+
assertEq(
115+
vaultManager.vaultShares(alice, aaveVaultL1),
116+
aaveVaultL1.totalShares() - sharesWithdrawAmount,
117+
"Shares mismatch after L1 withdrawal"
118+
);
115119
}
116120

117121
function testQueueAndCompleteWithdrawL2() public {
@@ -144,6 +148,10 @@ contract WithdrawTest is Test {
144148

145149
// Verify balances
146150
assertEq(mockUnderlyingToken.balanceOf(alice), 900 ether, "Alice did not receive correct L2 withdrawal amount");
147-
assertEq(vaultManager.vaultShares(alice, aaveVaultL2), aaveVaultL2.totalShares() - sharesWithdrawAmount, "Shares mismatch after L2 withdrawal");
151+
assertEq(
152+
vaultManager.vaultShares(alice, aaveVaultL2),
153+
aaveVaultL2.totalShares() - sharesWithdrawAmount,
154+
"Shares mismatch after L2 withdrawal"
155+
);
148156
}
149157
}

0 commit comments

Comments
 (0)