Skip to content

Commit 11e3a10

Browse files
misc: Remove unused storage fields
1 parent 48b0cac commit 11e3a10

File tree

2 files changed

+0
-122
lines changed

2 files changed

+0
-122
lines changed

src/ATokenVaultFactory.sol

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,6 @@ contract ATokenVaultFactory {
6565
/// @notice Array of all deployed vaults
6666
address[] internal _allVaults;
6767

68-
/// @notice Mapping from underlying asset to deployed vaults
69-
mapping(address => address[]) internal _vaultsByUnderlying;
70-
71-
/// @notice Mapping from deployer to deployed vaults
72-
mapping(address => address[]) internal _vaultsByDeployer;
73-
74-
/// @notice Mapping to check if a vault was deployed by this factory
75-
mapping(address => bool) internal _isVaultDeployed;
76-
7768
/// @notice Proxy admin address for all deployed vaults
7869
address public immutable PROXY_ADMIN;
7970

@@ -156,9 +147,6 @@ contract ATokenVaultFactory {
156147
);
157148

158149
_allVaults.push(vault);
159-
_vaultsByUnderlying[params.underlying].push(vault);
160-
_vaultsByDeployer[msg.sender].push(vault);
161-
_isVaultDeployed[vault] = true;
162150

163151
emit VaultDeployed(
164152
vault,
@@ -189,24 +177,6 @@ contract ATokenVaultFactory {
189177
return _allVaults;
190178
}
191179

192-
/**
193-
* @notice Get vaults by underlying asset
194-
* @param underlying The underlying asset address
195-
* @return Array of vault addresses for the underlying asset
196-
*/
197-
function getVaultsByUnderlying(address underlying) external view returns (address[] memory) {
198-
return _vaultsByUnderlying[underlying];
199-
}
200-
201-
/**
202-
* @notice Get vaults by deployer
203-
* @param deployer The deployer address
204-
* @return Array of vault addresses deployed by the deployer
205-
*/
206-
function getVaultsByDeployer(address deployer) external view returns (address[] memory) {
207-
return _vaultsByDeployer[deployer];
208-
}
209-
210180
/**
211181
* @notice Get vault deployment info
212182
* @param vaultIndex The index of the vault in allVaults array
@@ -222,13 +192,4 @@ contract ATokenVaultFactory {
222192
ATokenVault vaultContract = ATokenVault(vault);
223193
underlying = address(vaultContract.UNDERLYING());
224194
}
225-
226-
/**
227-
* @notice Check if a vault was deployed by this factory
228-
* @param vault The vault address to check
229-
* @return True if the vault was deployed by this factory
230-
*/
231-
function isDeployedVault(address vault) external view returns (bool) {
232-
return _isVaultDeployed[vault];
233-
}
234195
}

test/ATokenVaultFactory.t.sol

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ contract ATokenVaultFactoryTest is Test {
7272
vm.stopPrank();
7373

7474
assertTrue(vault != address(0));
75-
assertTrue(factory.isDeployedVault(vault));
76-
assertEq(factory.getAllVaultsLength(), 1);
77-
assertEq(factory.getAllVaults()[0], vault);
7875

7976
ATokenVault vaultContract = ATokenVault(vault);
8077
assertEq(address(vaultContract.UNDERLYING()), address(dai));
@@ -83,14 +80,6 @@ contract ATokenVaultFactoryTest is Test {
8380
assertEq(vaultContract.name(), "Test Vault");
8481
assertEq(vaultContract.symbol(), "tVault");
8582
assertEq(vaultContract.getFee(), 0);
86-
87-
address[] memory aliceVaults = factory.getVaultsByDeployer(ALICE);
88-
assertEq(aliceVaults.length, 1);
89-
assertEq(aliceVaults[0], vault);
90-
91-
address[] memory daiVaults = factory.getVaultsByUnderlying(address(dai));
92-
assertEq(daiVaults.length, 1);
93-
assertEq(daiVaults[0], vault);
9483
}
9584

9685
function testDeployVaultWithFee() public {
@@ -173,19 +162,6 @@ contract ATokenVaultFactoryTest is Test {
173162

174163
assertTrue(vault1 != vault2);
175164

176-
address[] memory daiVaults = factory.getVaultsByUnderlying(address(dai));
177-
assertEq(daiVaults.length, 2);
178-
assertEq(daiVaults[0], vault1);
179-
assertEq(daiVaults[1], vault2);
180-
181-
address[] memory aliceVaults = factory.getVaultsByDeployer(ALICE);
182-
assertEq(aliceVaults.length, 1);
183-
assertEq(aliceVaults[0], vault1);
184-
185-
address[] memory bobVaults = factory.getVaultsByDeployer(BOB);
186-
assertEq(bobVaults.length, 1);
187-
assertEq(bobVaults[0], vault2);
188-
189165
ATokenVault vault1Contract = ATokenVault(vault1);
190166
ATokenVault vault2Contract = ATokenVault(vault2);
191167
assertEq(vault1Contract.owner(), ALICE);
@@ -327,17 +303,6 @@ contract ATokenVaultFactoryTest is Test {
327303

328304
ATokenVault vaultContract = ATokenVault(vault);
329305
assertEq(vaultContract.owner(), BOB);
330-
331-
address[] memory aliceVaults = factory.getVaultsByDeployer(ALICE);
332-
assertEq(aliceVaults.length, 1);
333-
assertEq(aliceVaults[0], vault);
334-
335-
address[] memory bobVaults = factory.getVaultsByDeployer(BOB);
336-
assertEq(bobVaults.length, 0);
337-
338-
address[] memory daiVaults = factory.getVaultsByUnderlying(address(dai));
339-
assertEq(daiVaults.length, 1);
340-
assertEq(daiVaults[0], vault);
341306
}
342307

343308
/*//////////////////////////////////////////////////////////////
@@ -616,43 +581,6 @@ contract ATokenVaultFactoryTest is Test {
616581
assertEq(underlying2, address(dai));
617582
}
618583

619-
function testIsDeployedVault() public {
620-
uint256 initialDeposit = 1000 * 1e18;
621-
deal(address(dai), ALICE, initialDeposit);
622-
623-
vm.startPrank(ALICE);
624-
dai.approve(address(factory), initialDeposit);
625-
626-
ATokenVaultFactory.VaultParams memory params = ATokenVaultFactory.VaultParams({
627-
underlying: address(dai),
628-
referralCode: 0,
629-
poolAddressesProvider: IPoolAddressesProvider(address(poolAddrProvider)),
630-
owner: ALICE,
631-
initialFee: 0,
632-
shareName: "Test Vault",
633-
shareSymbol: "tVault",
634-
initialLockDeposit: initialDeposit
635-
});
636-
637-
address vault = factory.deployVault(params);
638-
vm.stopPrank();
639-
640-
assertTrue(factory.isDeployedVault(vault));
641-
assertFalse(factory.isDeployedVault(address(0x999)));
642-
assertFalse(factory.isDeployedVault(address(0)));
643-
assertFalse(factory.isDeployedVault(address(factory)));
644-
}
645-
646-
function testGetVaultsByUnderlyingEmpty() public {
647-
address[] memory vaults = factory.getVaultsByUnderlying(address(dai));
648-
assertEq(vaults.length, 0);
649-
}
650-
651-
function testGetVaultsByDeployerEmpty() public {
652-
address[] memory vaults = factory.getVaultsByDeployer(ALICE);
653-
assertEq(vaults.length, 0);
654-
}
655-
656584
function testGetAllVaultsEmpty() public {
657585
address[] memory vaults = factory.getAllVaults();
658586
assertEq(vaults.length, 0);
@@ -742,14 +670,6 @@ contract ATokenVaultFactoryTest is Test {
742670

743671
assertTrue(daiVault != usdcVault);
744672
assertEq(factory.getAllVaultsLength(), 2);
745-
746-
address[] memory daiVaults = factory.getVaultsByUnderlying(address(dai));
747-
address[] memory usdcVaults = factory.getVaultsByUnderlying(address(usdc));
748-
749-
assertEq(daiVaults.length, 1);
750-
assertEq(usdcVaults.length, 1);
751-
assertEq(daiVaults[0], daiVault);
752-
assertEq(usdcVaults[0], usdcVault);
753673
}
754674

755675
function testDeploymentCounterIncreases() public {
@@ -812,7 +732,6 @@ contract ATokenVaultFactoryTest is Test {
812732
vm.stopPrank();
813733

814734
assertTrue(vault != address(0));
815-
assertTrue(factory.isDeployedVault(vault));
816735
}
817736

818737
function testDeployVaultEdgeCaseZeroFee() public {
@@ -897,7 +816,6 @@ contract ATokenVaultFactoryTest is Test {
897816
vm.stopPrank();
898817

899818
assertTrue(vault != address(0));
900-
assertTrue(factory.isDeployedVault(vault));
901819

902820
ATokenVault vaultContract = ATokenVault(vault);
903821
assertEq(vaultContract.REFERRAL_CODE(), referralCode);
@@ -931,7 +849,6 @@ contract ATokenVaultFactoryTest is Test {
931849
vm.stopPrank();
932850

933851
assertTrue(vault != address(0));
934-
assertTrue(factory.isDeployedVault(vault));
935852

936853
ATokenVault vaultContract = ATokenVault(vault);
937854
assertEq(vaultContract.REFERRAL_CODE(), referralCode);

0 commit comments

Comments
 (0)