chore: renaming of the getPool for consistency

Author: baroooo

contracts/interfaces/IFPMMFactory.sol

@@ -79,14 +79,6 @@ interface IFPMMFactory {
    */
   function governance() external view returns (address);
 
-  /**
-   * @notice Gets the address of the deployed FPMM for a token pair.
-   * @param token0 The address of the first token
-   * @param token1 The address of the second token
-   * @return The address of the deployed FPMM for the token pair
-   */
-  function deployedFPMMs(address token0, address token1) external view returns (address);
-
   /**
    * @notice Gets the list of deployed FPMM addresses.
    * @return The list of deployed FPMM addresses
@@ -132,7 +124,7 @@ interface IFPMMFactory {
   function isPool(address token0, address token1) external view returns (bool);
 
   /**
-   * @notice Gets the address of the deployed FPMM for a token pair.
+   * @notice Gets the address of the deployed FPMM for a token pair..
    * @param token0 The address of the first token
    * @param token1 The address of the second token
    * @return The address of the deployed FPMM for the token pair

contracts/swap/FPMMFactory.sol

@@ -109,12 +109,6 @@ contract FPMMFactory is IFPMMFactory, OwnableUpgradeable {
     return $.governance;
   }
 
-  /// @inheritdoc IFPMMFactory
-  function deployedFPMMs(address token0, address token1) public view returns (address) {
-    FPMMFactoryStorage storage $ = _getFPMMStorage();
-    return $.deployedFPMMs[token0][token1];
-  }
-
   /// @inheritdoc IFPMMFactory
   function deployedFPMMAddresses() public view returns (address[] memory) {
     FPMMFactoryStorage storage $ = _getFPMMStorage();
@@ -139,7 +133,7 @@ contract FPMMFactory is IFPMMFactory, OwnableUpgradeable {
     (token0, token1) = sortTokens(token0, token1);
 
     if (isPool(token0, token1)) {
-      return deployedFPMMs(token0, token1);
+      return getPool(token0, token1);
     }
 
     (address precomputedProxyAddress, ) = _computeProxyAddressAndSalt(token0, token1);
@@ -156,13 +150,13 @@ contract FPMMFactory is IFPMMFactory, OwnableUpgradeable {
 
   /// @inheritdoc IFPMMFactory
   function isPool(address token0, address token1) public view returns (bool) {
-    return deployedFPMMs(token0, token1) != address(0);
+    return getPool(token0, token1) != address(0);
   }
 
   /// @inheritdoc IFPMMFactory
-  function getPool(address token0, address token1) external view returns (address) {
-    require(isPool(token0, token1), "FPMMFactory: POOL_NOT_FOUND");
-    return deployedFPMMs(token0, token1);
+  function getPool(address token0, address token1) public view returns (address) {
+    FPMMFactoryStorage storage $ = _getFPMMStorage();
+    return $.deployedFPMMs[token0][token1];
   }
 
   /* ============================================================ */

contracts/swap/router/Router.sol

@@ -126,7 +126,7 @@ contract Router is IRouter, ERC2771Context {
     uint256 amountADesired,
     uint256 amountBDesired
   ) public view returns (uint256 amountA, uint256 amountB, uint256 liquidity) {
-    address _pool = IFPMMFactory(_factory).deployedFPMMs(tokenA, tokenB);
+    address _pool = IFPMMFactory(_factory).getPool(tokenA, tokenB);
     (uint256 reserveA, uint256 reserveB) = (0, 0);
     uint256 _totalSupply = 0;
     if (_pool != address(0)) {
@@ -156,7 +156,7 @@ contract Router is IRouter, ERC2771Context {
     address _factory,
     uint256 liquidity
   ) public view returns (uint256 amountA, uint256 amountB) {
-    address _pool = IFPMMFactory(_factory).deployedFPMMs(tokenA, tokenB);
+    address _pool = IFPMMFactory(_factory).getPool(tokenA, tokenB);
 
     if (_pool == address(0)) {
       return (0, 0);
@@ -180,7 +180,7 @@ contract Router is IRouter, ERC2771Context {
     if (amountADesired < amountAMin) revert InsufficientAmountADesired();
     if (amountBDesired < amountBMin) revert InsufficientAmountBDesired();
     // create the pool if it doesn't exist yet
-    address _pool = IFPMMFactory(defaultFactory).deployedFPMMs(tokenA, tokenB);
+    address _pool = IFPMMFactory(defaultFactory).getPool(tokenA, tokenB);
     if (_pool == address(0)) {
       revert PoolDoesNotExist();
     }

test/integration/protocol/FPMM/FPMMFactoryTests.t.sol

@@ -157,8 +157,8 @@ contract FPMMFactoryTests is FPMMBaseIntegration {
 
     (address token0, address token1) = _sortTokens(address(tokenA), address(tokenB));
 
-    assertEq(factory.deployedFPMMs(token0, token1), fpmm);
-    assertEq(factory.deployedFPMMs(token1, token0), address(0));
+    assertEq(factory.getPool(token0, token1), fpmm);
+    assertEq(factory.getPool(token1, token0), address(0));
     assertTrue(factory.isPool(address(token0), address(token1)));
     assertFalse(factory.isPool(address(token1), address(token0)));
 
@@ -221,7 +221,7 @@ contract FPMMFactoryTests is FPMMBaseIntegration {
     );
 
     assertTrue(fpmm != address(0));
-    assertEq(factory.deployedFPMMs(address(tokenA), address(tokenC)), fpmm);
+    assertEq(factory.getPool(address(tokenA), address(tokenC)), fpmm);
     assertTrue(factory.isPool(address(tokenA), address(tokenC)));
 
     // Verify custom configuration
@@ -259,13 +259,7 @@ contract FPMMFactoryTests is FPMMBaseIntegration {
     (address token0, address token1) = _sortTokens(address(tokenA), address(tokenB));
 
     assertEq(factory.getPool(token0, token1), fpmm);
-    vm.expectRevert("FPMMFactory: POOL_NOT_FOUND");
-    factory.getPool(token1, token0);
-  }
-
-  function test_getPool_whenPoolDoesNotExist_shouldRevert() public {
-    vm.expectRevert("FPMMFactory: POOL_NOT_FOUND");
-    factory.getPool(address(tokenA), address(tokenB));
+    assertEq(factory.getPool(token1, token0), address(0));
   }
 
   function test_deployedFPMMs_whenPoolExists_shouldReturnPoolAddress() public {
@@ -279,13 +273,13 @@ contract FPMMFactoryTests is FPMMBaseIntegration {
 
     (address token0, address token1) = _sortTokens(address(tokenA), address(tokenB));
 
-    assertEq(factory.deployedFPMMs(token0, token1), fpmm);
-    assertEq(factory.deployedFPMMs(token1, token0), address(0));
+    assertEq(factory.getPool(token0, token1), fpmm);
+    assertEq(factory.getPool(token1, token0), address(0));
   }
 
   function test_deployedFPMMs_whenPoolDoesNotExist_shouldReturnZeroAddress() public view {
-    assertEq(factory.deployedFPMMs(address(tokenA), address(tokenB)), address(0));
-    assertEq(factory.deployedFPMMs(address(tokenB), address(tokenA)), address(0));
+    assertEq(factory.getPool(address(tokenA), address(tokenB)), address(0));
+    assertEq(factory.getPool(address(tokenB), address(tokenA)), address(0));
   }
 
   function test_deployedFPMMAddresses_whenPoolsDeployed_shouldReturnAllAddresses() public {
@@ -331,7 +325,7 @@ contract FPMMFactoryTests is FPMMBaseIntegration {
   function test_getOrPrecomputeProxyAddress_whenPoolDoesNotExist_shouldReturnPrecomputedAddress() public {
     address precomputedAddress = factory.getOrPrecomputeProxyAddress(address(tokenA), address(tokenB));
     assertTrue(precomputedAddress != address(0));
-    assertEq(factory.deployedFPMMs(address(tokenA), address(tokenB)), address(0));
+    assertEq(factory.getPool(address(tokenA), address(tokenB)), address(0));
 
     vm.prank(governance);
     address fpmm = factory.deployFPMM(

test/integration/protocol/FPMM/RouterTests.t.sol

@@ -259,7 +259,7 @@ contract RouterTests is FPMMBaseIntegration {
     assertEq(amount1, amount1Desired);
     assertEq(liquidity, 100e18 - 1e3);
 
-    address pool = factory.deployedFPMMs(token0, token1);
+    address pool = factory.getPool(token0, token1);
     assertEq(IERC20(pool).balanceOf(alice), liquidity);
 
     vm.stopPrank();

test/unit/swap/FPMM/FPMMFactory.t.sol

@@ -706,7 +706,7 @@ abstract contract FPMMFactoryTest_DeployFPMM is FPMMFactoryTest {
     address deployedProxy = deploy("celo");
 
     assertEq(deployedProxy, expectedProxy);
-    assertEq(factoryCelo.deployedFPMMs(expectedToken0, expectedToken1), deployedProxy);
+    assertEq(factoryCelo.getPool(expectedToken0, expectedToken1), deployedProxy);
     assertEq(factoryCelo.deployedFPMMAddresses().length, 1);
     assertEq(factoryCelo.deployedFPMMAddresses()[0], deployedProxy);
 
@@ -753,7 +753,7 @@ abstract contract FPMMFactoryTest_DeployFPMM is FPMMFactoryTest {
     vm.selectFork(celoFork);
     vm.prank(governanceCelo);
     address celoFPMMProxy = deploy("celo");
-    assertEq(celoFPMMProxy, factoryCelo.deployedFPMMs(token0Celo, token1Celo));
+    assertEq(celoFPMMProxy, factoryCelo.getPool(token0Celo, token1Celo));
 
     vm.selectFork(opFork);
     vm.prank(deployer);
@@ -766,7 +766,7 @@ abstract contract FPMMFactoryTest_DeployFPMM is FPMMFactoryTest {
 
     vm.prank(governanceOp);
     address opFPMMProxy = deploy("op");
-    assertEq(opFPMMProxy, factoryOp.deployedFPMMs(token0Op, token1Op));
+    assertEq(opFPMMProxy, factoryOp.getPool(token0Op, token1Op));
 
     assertEq(opFPMMProxy, celoFPMMProxy);
   }
@@ -951,8 +951,8 @@ contract FPMMFactoryTest_SortTokens is FPMMFactoryTest {
     assertEq(fpmm.token1(), higherToken); // Should be sorted to higher address
 
     // Verify the factory mapping uses sorted tokens
-    assertEq(factoryCelo.deployedFPMMs(lowerToken, higherToken), deployedProxy);
-    assertEq(factoryCelo.deployedFPMMs(higherToken, lowerToken), address(0)); // Should not exist
+    assertEq(factoryCelo.getPool(lowerToken, higherToken), deployedProxy);
+    assertEq(factoryCelo.getPool(higherToken, lowerToken), address(0)); // Should not exist
   }
 
   function testSortTokens_integrationWithGetOrPrecomputeProxyAddress_shouldUseSortedTokens() public {
@@ -978,7 +978,7 @@ contract FPMMFactoryTest_SortTokens is FPMMFactoryTest {
     assertEq(deployedProxy, precomputedAddress);
 
     // Verify the factory mapping uses sorted tokens
-    assertEq(factoryCelo.deployedFPMMs(lowerToken, higherToken), deployedProxy);
+    assertEq(factoryCelo.getPool(lowerToken, higherToken), deployedProxy);
   }
 
   function testSortTokens_deploymentMappingConsistency_shouldUseSortedTokensInMapping() public {
@@ -998,8 +998,8 @@ contract FPMMFactoryTest_SortTokens is FPMMFactoryTest {
     );
 
     // Verify the factory mapping only exists for sorted tokens
-    assertEq(factoryCelo.deployedFPMMs(lowerToken, higherToken), deployedProxy);
-    assertEq(factoryCelo.deployedFPMMs(higherToken, lowerToken), address(0));
+    assertEq(factoryCelo.getPool(lowerToken, higherToken), deployedProxy);
+    assertEq(factoryCelo.getPool(higherToken, lowerToken), address(0));
 
     // Verify deployedFPMMAddresses contains the deployed proxy
     address[] memory deployedAddresses = factoryCelo.deployedFPMMAddresses();
@@ -1025,12 +1025,12 @@ contract FPMMFactoryTest_SortTokens is FPMMFactoryTest {
     address proxyBC1 = factoryCelo.deployFPMM(address(fpmmImplementationCelo), tokenB, tokenC, referenceRateFeedID);
 
     // Verify mappings use sorted tokens
-    assertEq(factoryCelo.deployedFPMMs(tokenA, tokenB), proxyAB1);
-    assertEq(factoryCelo.deployedFPMMs(tokenB, tokenC), proxyBC1);
+    assertEq(factoryCelo.getPool(tokenA, tokenB), proxyAB1);
+    assertEq(factoryCelo.getPool(tokenB, tokenC), proxyBC1);
 
     // Verify reverse mappings don't exist
-    assertEq(factoryCelo.deployedFPMMs(tokenB, tokenA), address(0));
-    assertEq(factoryCelo.deployedFPMMs(tokenC, tokenB), address(0));
+    assertEq(factoryCelo.getPool(tokenB, tokenA), address(0));
+    assertEq(factoryCelo.getPool(tokenC, tokenB), address(0));
 
     // Verify deployed addresses list
     address[] memory deployedAddresses = factoryCelo.deployedFPMMAddresses();