👷🏻‍♂️ Rename isTokenWhitelisted

Kwenta · Jul 26, 2023 · 72fc5aa · 72fc5aa
1 parent 876ceb2
commit 72fc5aa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Account.sol b/src/Account.sol
@@ -1009,7 +1009,7 @@ contract Account is IAccount, Auth, OpsReady {
  /// @dev verify direction and validity of swap (i.e. sUSD <-> whitelisted token)
  if (
  tokenIn == address(MARGIN_ASSET)
- && SETTINGS.isWhitelistedTokens(tokenOut)
+ && SETTINGS.isTokenWhitelisted(tokenOut)
  ) {
  // if swapping sUSD for another token, ensure sufficient margin
  /// @dev margin is being transferred out of this contract
@@ -1024,7 +1024,7 @@ contract Account is IAccount, Auth, OpsReady {
  );
  } else if (
  tokenOut == address(MARGIN_ASSET)
- && SETTINGS.isWhitelistedTokens(tokenIn)
+ && SETTINGS.isTokenWhitelisted(tokenIn)
  ) {
  // if swapping another token for sUSD, incoming token must be transferred to the UniversalRouter
  /// @dev msg.sender must have approved Permit2 to spend at least the amountIn

diff --git a/src/Settings.sol b/src/Settings.sol
@@ -37,7 +37,7 @@ contract Settings is ISettings, Owned {
  //////////////////////////////////////////////////////////////*/
 
  /// @inheritdoc ISettings
- function isWhitelistedTokens(address _token)
+ function isTokenWhitelisted(address _token)
  external
  view
  override

diff --git a/src/interfaces/ISettings.sol b/src/interfaces/ISettings.sol
@@ -36,7 +36,7 @@ interface ISettings {
  /// @notice checks if token is whitelisted
  /// @param _token: address of the token to check
  /// @return true if token is whitelisted, false if not
- function isWhitelistedTokens(address _token) external view returns (bool);
+ function isTokenWhitelisted(address _token) external view returns (bool);
 
  /*//////////////////////////////////////////////////////////////
  SETTERS

diff --git a/test/unit/Settings.t.sol b/test/unit/Settings.t.sol
@@ -82,11 +82,11 @@ contract SettingsTest is Test, ConsolidatedEvents {
  //////////////////////////////////////////////////////////////*/
 
  function test_whitelistedTokens() public {
- assertEq(settings.isWhitelistedTokens(MARGIN_ASSET), false);
+ assertEq(settings.isTokenWhitelisted(MARGIN_ASSET), false);
  settings.setTokenWhitelistStatus(MARGIN_ASSET, true);
- assertEq(settings.isWhitelistedTokens(MARGIN_ASSET), true);
+ assertEq(settings.isTokenWhitelisted(MARGIN_ASSET), true);
  settings.setTokenWhitelistStatus(MARGIN_ASSET, false);
- assertEq(settings.isWhitelistedTokens(MARGIN_ASSET), false);
+ assertEq(settings.isTokenWhitelisted(MARGIN_ASSET), false);
  }
 
  function test_setTokenWhitelistStatus_OnlyOwner() public {
@@ -96,11 +96,11 @@ contract SettingsTest is Test, ConsolidatedEvents {
  }
 
  function test_setTokenWhitelistStatus(address token) public {
- assertEq(settings.isWhitelistedTokens(token), false);
+ assertEq(settings.isTokenWhitelisted(token), false);
  settings.setTokenWhitelistStatus(token, true);
- assertEq(settings.isWhitelistedTokens(token), true);
+ assertEq(settings.isTokenWhitelisted(token), true);
  settings.setTokenWhitelistStatus(token, false);
- assertEq(settings.isWhitelistedTokens(token), false);
+ assertEq(settings.isTokenWhitelisted(token), false);
  }
 
  function test_setTokenWhitelistStatus_Event() public {