Skip to content

Commit 50bc950

Browse files
feat: Remove _allVaults field and related view functions
1 parent 1574756 commit 50bc950

File tree

2 files changed

+3
-138
lines changed

2 files changed

+3
-138
lines changed

src/ATokenVaultFactory.sol

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {ProxyAdmin} from "@openzeppelin/proxy/transparent/ProxyAdmin.sol";
1212

1313
/**
1414
* @title ATokenVaultImplDeploymentLib
15-
* @author Aave Protocol
15+
* @author Aave Labs
1616
* @notice Library that handles the deployment of the ATokenVault implementation contract
1717
* @dev This library is a helper to avoid holding the ATokenVault bytecode in the factory contract avoiding exceeding
1818
* the contract size limit.
@@ -33,7 +33,7 @@ library ATokenVaultImplDeploymentLib {
3333

3434
/**
3535
* @title ATokenVaultFactory
36-
* @author Aave Protocol
36+
* @author Aave Labs
3737
* @notice Factory contract for deploying ATokenVault instances
3838
*/
3939
contract ATokenVaultFactory {
@@ -60,12 +60,9 @@ contract ATokenVaultFactory {
6060
);
6161

6262
/*//////////////////////////////////////////////////////////////
63-
STATE VARIABLES
63+
CONSTANTS
6464
//////////////////////////////////////////////////////////////*/
6565

66-
/// @notice Array of all deployed vaults
67-
address[] internal _allVaults;
68-
6966
/// @notice Proxy admin address for all deployed vaults, with renounced ownership.
7067
/// @dev Future version will deploy a plain immutable vault without proxy.
7168
address internal immutable RENOUNCED_PROXY_ADMIN;
@@ -146,8 +143,6 @@ contract ATokenVaultFactory {
146143
params.initialLockDeposit
147144
);
148145

149-
_allVaults.push(vault);
150-
151146
emit VaultDeployed(
152147
vault,
153148
implementation,
@@ -156,40 +151,4 @@ contract ATokenVaultFactory {
156151
params
157152
);
158153
}
159-
160-
/*//////////////////////////////////////////////////////////////
161-
VIEW FUNCTIONS
162-
//////////////////////////////////////////////////////////////*/
163-
164-
/**
165-
* @notice Get the total number of deployed vaults
166-
* @return The total number of vaults
167-
*/
168-
function getAllVaultsLength() external view returns (uint256) {
169-
return _allVaults.length;
170-
}
171-
172-
/**
173-
* @notice Get all deployed vaults
174-
* @return Array of all vault addresses
175-
*/
176-
function getAllVaults() external view returns (address[] memory) {
177-
return _allVaults;
178-
}
179-
180-
/**
181-
* @notice Get vault deployment info
182-
* @param vaultIndex The index of the vault in allVaults array
183-
* @return vault The vault address
184-
* @return underlying The underlying asset
185-
*/
186-
function getVaultInfo(uint256 vaultIndex) external view returns (
187-
address vault,
188-
address underlying
189-
) {
190-
require(vaultIndex < _allVaults.length, "INVALID_VAULT_INDEX");
191-
vault = _allVaults[vaultIndex];
192-
ATokenVault vaultContract = ATokenVault(vault);
193-
underlying = address(vaultContract.UNDERLYING());
194-
}
195154
}

test/ATokenVaultFactory.t.sol

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,6 @@ contract ATokenVaultFactoryTest is Test {
159159
address vault2 = factory.deployVault(params2);
160160
vm.stopPrank();
161161

162-
assertEq(factory.getAllVaultsLength(), 2);
163-
address[] memory allVaults = factory.getAllVaults();
164-
assertEq(allVaults[0], vault1);
165-
assertEq(allVaults[1], vault2);
166-
167162
assertTrue(vault1 != vault2);
168163

169164
ATokenVault vault1Contract = ATokenVault(vault1);
@@ -544,93 +539,6 @@ contract ATokenVaultFactoryTest is Test {
544539
assertEq(value, bytes32(uint256(uint160(proxyAdmin))));
545540
}
546541

547-
/*//////////////////////////////////////////////////////////////
548-
VIEW FUNCTION TESTS
549-
//////////////////////////////////////////////////////////////*/
550-
551-
function testGetVaultInfo() public {
552-
uint256 initialDeposit = 1000 * 1e18;
553-
deal(address(dai), ALICE, initialDeposit);
554-
555-
vm.startPrank(ALICE);
556-
dai.approve(address(factory), initialDeposit);
557-
558-
ATokenVaultFactory.VaultParams memory params = ATokenVaultFactory.VaultParams({
559-
underlying: address(dai),
560-
referralCode: 0,
561-
poolAddressesProvider: IPoolAddressesProvider(address(poolAddrProvider)),
562-
owner: ALICE,
563-
initialFee: 0,
564-
shareName: "Test Vault",
565-
shareSymbol: "tVault",
566-
initialLockDeposit: initialDeposit
567-
});
568-
569-
address vault = factory.deployVault(params);
570-
vm.stopPrank();
571-
572-
(address vaultAddr, address underlying) = factory.getVaultInfo(0);
573-
assertEq(vaultAddr, vault);
574-
assertEq(underlying, address(dai));
575-
}
576-
577-
function testGetVaultInfoInvalidIndexReverts() public {
578-
vm.expectRevert("INVALID_VAULT_INDEX");
579-
factory.getVaultInfo(0);
580-
}
581-
582-
function testGetVaultInfoMultipleVaults() public {
583-
uint256 initialDeposit = 1000 * 1e18;
584-
585-
deal(address(dai), ALICE, initialDeposit * 2);
586-
vm.startPrank(ALICE);
587-
dai.approve(address(factory), initialDeposit * 2);
588-
589-
ATokenVaultFactory.VaultParams memory params1 = ATokenVaultFactory.VaultParams({
590-
underlying: address(dai),
591-
referralCode: 0,
592-
poolAddressesProvider: IPoolAddressesProvider(address(poolAddrProvider)),
593-
owner: ALICE,
594-
initialFee: 0,
595-
shareName: "First Vault",
596-
shareSymbol: "FV",
597-
initialLockDeposit: initialDeposit
598-
});
599-
600-
address vault1 = factory.deployVault(params1);
601-
602-
vm.roll(block.number + 1);
603-
vm.warp(block.timestamp + 1);
604-
605-
ATokenVaultFactory.VaultParams memory params2 = ATokenVaultFactory.VaultParams({
606-
underlying: address(dai),
607-
referralCode: 0,
608-
poolAddressesProvider: IPoolAddressesProvider(address(poolAddrProvider)),
609-
owner: ALICE,
610-
initialFee: 0,
611-
shareName: "Second Vault",
612-
shareSymbol: "SV",
613-
initialLockDeposit: initialDeposit
614-
});
615-
616-
address vault2 = factory.deployVault(params2);
617-
vm.stopPrank();
618-
619-
(address vaultAddr1, address underlying1) = factory.getVaultInfo(0);
620-
(address vaultAddr2, address underlying2) = factory.getVaultInfo(1);
621-
622-
assertEq(vaultAddr1, vault1);
623-
assertEq(underlying1, address(dai));
624-
assertEq(vaultAddr2, vault2);
625-
assertEq(underlying2, address(dai));
626-
}
627-
628-
function testGetAllVaultsEmpty() public {
629-
address[] memory vaults = factory.getAllVaults();
630-
assertEq(vaults.length, 0);
631-
assertEq(factory.getAllVaultsLength(), 0);
632-
}
633-
634542
/*//////////////////////////////////////////////////////////////
635543
INTEGRATION TESTS
636544
//////////////////////////////////////////////////////////////*/
@@ -713,7 +621,6 @@ contract ATokenVaultFactoryTest is Test {
713621
vm.stopPrank();
714622

715623
assertTrue(daiVault != usdcVault);
716-
assertEq(factory.getAllVaultsLength(), 2);
717624
}
718625

719626
function testDeploymentCounterIncreases() public {
@@ -751,7 +658,6 @@ contract ATokenVaultFactoryTest is Test {
751658
assertTrue(vault1 != vault2);
752659
assertTrue(vault2 != vault3);
753660
assertTrue(vault1 != vault3);
754-
assertEq(factory.getAllVaultsLength(), 3);
755661
}
756662

757663
function testDeployVaultEdgeCaseMinimalDeposit() public {

0 commit comments

Comments
 (0)