integrate and expand test

Author: hoytech

test/FactoryTest.t.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.24;
 
-import {stdError} from "forge-std/Test.sol";
 import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
 import {PoolManagerDeployer} from "./utils/PoolManagerDeployer.sol";
 import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";
@@ -249,56 +248,75 @@ contract FactoryTest is EulerSwapTestBase {
         EulerSwap(eulerSwapImpl).getReserves();
     }
 
-
-
     address alice = makeAddr("alice");
     address bob = makeAddr("bob");
 
     function test_multipleUninstalls() public {
-        // Parameters for deployPool()
-        IEulerSwap.Params memory params = IEulerSwap.Params({
-            vault0: address(eTST),
-            vault1: address(eTST2),
-            eulerAccount: address(0),
-            equilibriumReserve0: 1e18,
-            equilibriumReserve1: 1e18,
-            priceX: 1e18,
-            priceY: 1e18,
-            concentrationX: 0,
-            concentrationY: 0,
-            fee: 0,
-            protocolFee: 0,
-            protocolFeeRecipient: address(0)
-        });
-        IEulerSwap.InitialState memory initialState = IEulerSwap.InitialState({
-            currReserve0: 1e18, 
-            currReserve1: 1e18
-        });
-        bytes32 salt = bytes32(0);
+        (IEulerSwap.Params memory params, IEulerSwap.InitialState memory initialState) = getBasicParams();
 
         // Deploy pool for Alice
-        params.eulerAccount = alice;
-        address alicePool = eulerSwapFactory.computePoolAddress(params, salt);
+        params.eulerAccount = holder = alice;
+        (address alicePool, bytes32 aliceSalt) = mineSalt(params);
+
         vm.startPrank(alice);
         evc.setAccountOperator(alice, alicePool, true);
-        eulerSwapFactory.deployPool(params, initialState, salt);
+        eulerSwapFactory.deployPool(params, initialState, aliceSalt);
 
         // Deploy pool for Bob
-        params.eulerAccount = bob;
-        address bobPool = eulerSwapFactory.computePoolAddress(params, salt);
+        params.eulerAccount = holder = bob;
+        (address bobPool, bytes32 bobSalt) = mineSalt(params);
+
         vm.startPrank(bob);
         evc.setAccountOperator(bob, bobPool, true);
-        eulerSwapFactory.deployPool(params, initialState, salt);
+        eulerSwapFactory.deployPool(params, initialState, bobSalt);
+
+        {
+            address[] memory ps = eulerSwapFactory.pools();
+            assertEq(ps.length, 2);
+            assertEq(ps[0], alicePool);
+            assertEq(ps[1], bobPool);
+        }
+
+        {
+            (address asset0, address asset1) = EulerSwap(alicePool).getAssets();
+            address[] memory ps = eulerSwapFactory.poolsByPair(asset0, asset1);
+            assertEq(ps.length, 2);
+            assertEq(ps[0], alicePool);
+            assertEq(ps[1], bobPool);
+        }
 
         // Uninstall pool for Alice
         vm.startPrank(alice);
         evc.setAccountOperator(alice, alicePool, false);
         eulerSwapFactory.uninstallPool();
 
+        {
+            address[] memory ps = eulerSwapFactory.pools();
+            assertEq(ps.length, 1);
+            assertEq(ps[0], bobPool);
+        }
+
+        {
+            (address asset0, address asset1) = EulerSwap(alicePool).getAssets();
+            address[] memory ps = eulerSwapFactory.poolsByPair(asset0, asset1);
+            assertEq(ps.length, 1);
+            assertEq(ps[0], bobPool);
+        }
+
         // Uninstalling pool for Bob reverts due to an OOB access of the allPools array
         vm.startPrank(bob);
         evc.setAccountOperator(bob, bobPool, false);
-        vm.expectRevert(stdError.indexOOBError);
         eulerSwapFactory.uninstallPool();
+
+        {
+            address[] memory ps = eulerSwapFactory.pools();
+            assertEq(ps.length, 0);
+        }
+
+        {
+            (address asset0, address asset1) = EulerSwap(alicePool).getAssets();
+            address[] memory ps = eulerSwapFactory.poolsByPair(asset0, asset1);
+            assertEq(ps.length, 0);
+        }
     }
 }