feat: rename functions

Author: efecarranza

src/contracts/facilitators/gsm/swapFreezer/ChainlinkOracleSwapFreezer.sol

@@ -10,7 +10,7 @@ import {OracleSwapFreezerBase} from 'src/contracts/facilitators/gsm/swapFreezer/
  * @title ChainlinkOracleSwapFreezer
  * @notice Chainlink-compatible automated swap freezer for GSM.
  */
-contract ChainlinkOracleSwapFreezer is OracleSwapFreezerBase {
+contract ChainlinkOracleSwapFreezer is OracleSwapFreezerBase, AutomationCompatibleInterface {
   /**
    * @dev Constructor
    * @dev Freeze/unfreeze bounds are specified in USD with 8-decimal precision, like Aave v3 Price Oracles
@@ -48,7 +48,17 @@ contract ChainlinkOracleSwapFreezer is OracleSwapFreezerBase {
   {}
 
   /// @inheritdoc AutomationCompatibleInterface
-  function checkUpkeep(bytes calldata) external view override returns (bool, bytes memory) {
+  function performUpkeep(bytes calldata) external {
+    Action action = _getAction();
+    if (action == Action.FREEZE) {
+      GSM.setSwapFreeze(true);
+    } else if (action == Action.UNFREEZE) {
+      GSM.setSwapFreeze(false);
+    }
+  }
+
+  /// @inheritdoc AutomationCompatibleInterface
+  function checkUpkeep(bytes calldata) external view returns (bool, bytes memory) {
     return (_getAction() == Action.NONE ? false : true, '');
   }
 }

src/contracts/facilitators/gsm/swapFreezer/GelatoOracleSwapFreezer.sol

@@ -46,13 +46,25 @@ contract GelatoOracleSwapFreezer is OracleSwapFreezerBase {
     )
   {}
 
+  /**
+   * @notice Executes a given action on the GSM depending on the oracle value
+   */
+  function execute(bytes calldata) external {
+    Action action = _getAction();
+    if (action == Action.FREEZE) {
+      GSM.setSwapFreeze(true);
+    } else if (action == Action.UNFREEZE) {
+      GSM.setSwapFreeze(false);
+    }
+  }
+
   /**
    * @notice Returns whether the action can be performed and the encoded call data for execution.
    * @return True if the action can be performed, false otherwise.
    * @return The encoded call data for the action to be executed.
    */
 
-  function checkUpkeep(bytes calldata) external view override returns (bool, bytes memory) {
-    return (_getAction() == Action.NONE ? false : true, abi.encodeCall(this.performUpkeep, ''));
+  function checkExecute(bytes calldata) external view returns (bool, bytes memory) {
+    return (_getAction() == Action.NONE ? false : true, abi.encodeCall(this.execute, ''));
   }
 }

src/contracts/facilitators/gsm/swapFreezer/OracleSwapFreezerBase.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.10;
 
 import {IPoolAddressesProvider} from 'aave-v3-origin/contracts/interfaces/IPoolAddressesProvider.sol';
 import {IPriceOracle} from 'aave-v3-origin/contracts/interfaces/IPriceOracle.sol';
-import {AutomationCompatibleInterface} from 'src/contracts/dependencies/chainlink/AutomationCompatibleInterface.sol';
 import {IGsm} from 'src/contracts/facilitators/gsm/interfaces/IGsm.sol';
 
 /**
@@ -14,7 +13,7 @@ import {IGsm} from 'src/contracts/facilitators/gsm/interfaces/IGsm.sol';
  * @dev Freeze action is executable if GSM is not seized, not frozen and price is outside of the freeze bounds
  * @dev Unfreeze action is executable if GSM is not seized, frozen, unfreezing is allowed and price is inside the unfreeze bounds
  */
-abstract contract OracleSwapFreezerBase is AutomationCompatibleInterface {
+abstract contract OracleSwapFreezerBase {
   enum Action {
     NONE,
     FREEZE,
@@ -75,19 +74,6 @@ abstract contract OracleSwapFreezerBase is AutomationCompatibleInterface {
     _allowUnfreeze = allowUnfreeze;
   }
 
-  /// @inheritdoc AutomationCompatibleInterface
-  function performUpkeep(bytes calldata) external {
-    Action action = _getAction();
-    if (action == Action.FREEZE) {
-      GSM.setSwapFreeze(true);
-    } else if (action == Action.UNFREEZE) {
-      GSM.setSwapFreeze(false);
-    }
-  }
-
-  /// @inheritdoc AutomationCompatibleInterface
-  function checkUpkeep(bytes calldata) external view virtual returns (bool, bytes memory);
-
   /**
    * @notice Returns whether or not the swap freezer can unfreeze a GSM
    * @return True if the freezer can unfreeze, false otherwise

tests/unit/TestChainlinkOracleSwapFreezer.t.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 import './TestOracleSwapFreezerBase.t.sol';
-import {ChainlinkOracleSwapFreezer} from 'src/contracts/facilitators/gsm/swapFreezer/ChainlinkOracleSwapFreezer.sol';
 
 contract TestChainlinkOracleSwapFreezer is TestOracleSwapFreezerBase {
   function _deployOracleSwapFreezer(
@@ -28,6 +27,13 @@ contract TestChainlinkOracleSwapFreezer is TestOracleSwapFreezerBase {
       );
   }
 
+  function _checkAutomation(
+    OracleSwapFreezerBase _swapFreezer
+  ) internal view override returns (bool) {
+    (bool shouldRunKeeper, ) = _swapFreezer.checkUpkeep('');
+    return shouldRunKeeper;
+  }
+
   function _checkAndPerformAutomation(
     OracleSwapFreezerBase _swapFreezer
   ) internal override returns (bool) {

tests/unit/TestGelatoOracleSwapFreezer.t.sol

@@ -3,16 +3,12 @@ pragma solidity ^0.8.0;
 
 import './TestOracleSwapFreezerBase.t.sol';
 import {Address} from 'openzeppelin-contracts/contracts/utils/Address.sol';
-import {IGsm} from 'src/contracts/facilitators/gsm/interfaces/IGsm.sol';
-import {IPoolAddressesProvider} from 'aave-v3-origin/contracts/interfaces/IPoolAddressesProvider.sol';
-import {GelatoOracleSwapFreezer} from 'src/contracts/facilitators/gsm/swapFreezer/GelatoOracleSwapFreezer.sol';
-import {OracleSwapFreezerBase} from 'src/contracts/facilitators/gsm/swapFreezer/OracleSwapFreezerBase.sol';
 
 contract TestGsmGelatoOracleSwapFreezer is TestOracleSwapFreezerBase {
   using Address for address;
 
   function testCheckUpkeepReturnsCorrectSelector() public view {
-    (, bytes memory data) = swapFreezer.checkUpkeep('');
+    (, bytes memory data) = swapFreezer.checkExecute('');
     bytes4 selector;
     assembly {
       selector := mload(add(data, 32))
@@ -43,10 +39,17 @@ contract TestGsmGelatoOracleSwapFreezer is TestOracleSwapFreezerBase {
       );
   }
 
+  function _checkAutomation(
+    OracleSwapFreezerBase _swapFreezer
+  ) internal view override returns (bool) {
+    (bool shouldRunKeeper, ) = _swapFreezer.checkExecute('');
+    return shouldRunKeeper;
+  }
+
   function _checkAndPerformAutomation(
     OracleSwapFreezerBase _swapFreezer
   ) internal virtual override returns (bool) {
-    (bool shouldRunKeeper, bytes memory encodedPerformData) = _swapFreezer.checkUpkeep('');
+    (bool shouldRunKeeper, bytes memory encodedPerformData) = _swapFreezer.checkExecute('');
     if (shouldRunKeeper) {
       address(_swapFreezer).functionCall(encodedPerformData);
     }

tests/unit/TestGhoBase.t.sol

@@ -83,6 +83,8 @@ import {GhoGsmSteward} from 'src/contracts/misc/GhoGsmSteward.sol';
 import {FixedFeeStrategyFactory} from 'src/contracts/facilitators/gsm/feeStrategy/FixedFeeStrategyFactory.sol';
 import {GhoReserve} from 'src/contracts/facilitators/gsm/GhoReserve.sol';
 import {OwnableFacilitator} from 'src/contracts/facilitators/gsm/OwnableFacilitator.sol';
+import {ChainlinkOracleSwapFreezer} from 'src/contracts/facilitators/gsm/swapFreezer/ChainlinkOracleSwapFreezer.sol';
+import {GelatoOracleSwapFreezer} from 'src/contracts/facilitators/gsm/swapFreezer/GelatoOracleSwapFreezer.sol';
 
 // CCIP contracts
 import {MockUpgradeableLockReleaseTokenPool} from '../mocks/MockUpgradeableLockReleaseTokenPool.sol';

tests/unit/TestOracleSwapFreezerBase.t.sol

@@ -373,10 +373,7 @@ abstract contract TestOracleSwapFreezerBase is TestGhoBase {
 
   function _checkAutomation(
     OracleSwapFreezerBase _swapFreezer
-  ) internal view virtual returns (bool) {
-    (bool shouldRunKeeper, ) = _swapFreezer.checkUpkeep('');
-    return shouldRunKeeper;
-  }
+  ) internal view virtual returns (bool);
 
   function _checkAndPerformAutomation(
     OracleSwapFreezerBase _swapFreezer