feat: Remove LendingPool references of contracts

contracts/adapters/BaseUniswapAdapter.sol

@@ -261,7 +261,7 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
    * @return address of the aToken
    */
   function _getReserveData(address asset) internal view returns (DataTypes.ReserveData memory) {
-    return LENDING_POOL.getReserveData(asset);
+    return POOL.getReserveData(asset);
   }
 
   /**
@@ -295,7 +295,7 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
     IERC20(reserveAToken).safeTransferFrom(user, address(this), amount);
 
     // withdraw reserve
-    LENDING_POOL.withdraw(reserve, amount, address(this));
+    POOL.withdraw(reserve, amount, address(this));
   }
 
   /**

contracts/adapters/FlashLiquidationAdapter.sol

@@ -68,7 +68,7 @@ contract FlashLiquidationAdapter is BaseUniswapAdapter {
     address initiator,
     bytes calldata params
   ) external override returns (bool) {
-    require(msg.sender == address(LENDING_POOL), 'CALLER_MUST_BE_LENDING_POOL');
+    require(msg.sender == address(POOL), 'CALLER_MUST_BE_POOL');
 
     LiquidationParams memory decodedParams = _decodeParams(params);
 
@@ -120,10 +120,10 @@ contract FlashLiquidationAdapter is BaseUniswapAdapter {
     vars.flashLoanDebt = flashBorrowedAmount.add(premium);
 
     // Approve Pool to use debt token for liquidation
-    IERC20(borrowedAsset).approve(address(LENDING_POOL), debtToCover);
+    IERC20(borrowedAsset).approve(address(POOL), debtToCover);
 
     // Liquidate the user position and release the underlying collateral
-    LENDING_POOL.liquidationCall(collateralAsset, borrowedAsset, user, debtToCover, false);
+    POOL.liquidationCall(collateralAsset, borrowedAsset, user, debtToCover, false);
 
     // Discover the liquidated tokens
     uint256 collateralBalanceAfter = IERC20(collateralAsset).balanceOf(address(this));
@@ -152,7 +152,7 @@ contract FlashLiquidationAdapter is BaseUniswapAdapter {
     }
 
     // Allow repay of flash loan
-    IERC20(borrowedAsset).approve(address(LENDING_POOL), vars.flashLoanDebt);
+    IERC20(borrowedAsset).approve(address(POOL), vars.flashLoanDebt);
 
     // Transfer remaining tokens to initiator
     if (vars.remainingTokens > 0) {

contracts/adapters/UniswapLiquiditySwapAdapter.sol

@@ -61,7 +61,7 @@ contract UniswapLiquiditySwapAdapter is BaseUniswapAdapter {
     address initiator,
     bytes calldata params
   ) external override returns (bool) {
-    require(msg.sender == address(LENDING_POOL), 'CALLER_MUST_BE_LENDING_POOL');
+    require(msg.sender == address(POOL), 'CALLER_MUST_BE_POOL');
 
     SwapParams memory decodedParams = _decodeParams(params);
 
@@ -170,9 +170,9 @@ contract UniswapLiquiditySwapAdapter is BaseUniswapAdapter {
       );
 
       // Deposit new reserve
-      IERC20(assetToSwapToList[vars.i]).safeApprove(address(LENDING_POOL), 0);
-      IERC20(assetToSwapToList[vars.i]).safeApprove(address(LENDING_POOL), vars.receivedAmount);
-      LENDING_POOL.deposit(assetToSwapToList[vars.i], vars.receivedAmount, msg.sender, 0);
+      IERC20(assetToSwapToList[vars.i]).safeApprove(address(POOL), 0);
+      IERC20(assetToSwapToList[vars.i]).safeApprove(address(POOL), vars.receivedAmount);
+      POOL.deposit(assetToSwapToList[vars.i], vars.receivedAmount, msg.sender, 0);
     }
   }
 
@@ -226,18 +226,18 @@ contract UniswapLiquiditySwapAdapter is BaseUniswapAdapter {
     );
 
     // Deposit new reserve
-    IERC20(assetTo).safeApprove(address(LENDING_POOL), 0);
-    IERC20(assetTo).safeApprove(address(LENDING_POOL), vars.receivedAmount);
-    LENDING_POOL.deposit(assetTo, vars.receivedAmount, initiator, 0);
+    IERC20(assetTo).safeApprove(address(POOL), 0);
+    IERC20(assetTo).safeApprove(address(POOL), vars.receivedAmount);
+    POOL.deposit(assetTo, vars.receivedAmount, initiator, 0);
 
     vars.flashLoanDebt = amount.add(premium);
     vars.amountToPull = vars.amountToSwap.add(premium);
 
     _pullAToken(assetFrom, vars.aToken, initiator, vars.amountToPull, permitSignature);
 
     // Repay flash loan
-    IERC20(assetFrom).safeApprove(address(LENDING_POOL), 0);
-    IERC20(assetFrom).safeApprove(address(LENDING_POOL), vars.flashLoanDebt);
+    IERC20(assetFrom).safeApprove(address(POOL), 0);
+    IERC20(assetFrom).safeApprove(address(POOL), vars.flashLoanDebt);
   }
 
   /**

contracts/adapters/UniswapRepayAdapter.sol

@@ -55,7 +55,7 @@ contract UniswapRepayAdapter is BaseUniswapAdapter {
     address initiator,
     bytes calldata params
   ) external override returns (bool) {
-    require(msg.sender == address(LENDING_POOL), 'CALLER_MUST_BE_LENDING_POOL');
+    require(msg.sender == address(POOL), 'CALLER_MUST_BE_POOL');
 
     RepayParams memory decodedParams = _decodeParams(params);
 
@@ -142,9 +142,9 @@ contract UniswapRepayAdapter is BaseUniswapAdapter {
     }
 
     // Repay debt. Approves 0 first to comply with tokens that implement the anti frontrunning approval fix
-    IERC20(debtAsset).safeApprove(address(LENDING_POOL), 0);
-    IERC20(debtAsset).safeApprove(address(LENDING_POOL), amountToRepay);
-    LENDING_POOL.repay(debtAsset, amountToRepay, debtRateMode, msg.sender);
+    IERC20(debtAsset).safeApprove(address(POOL), 0);
+    IERC20(debtAsset).safeApprove(address(POOL), amountToRepay);
+    POOL.repay(debtAsset, amountToRepay, debtRateMode, msg.sender);
   }
 
   /**
@@ -173,10 +173,10 @@ contract UniswapRepayAdapter is BaseUniswapAdapter {
     DataTypes.ReserveData memory collateralReserveData = _getReserveData(collateralAsset);
 
     // Repay debt. Approves for 0 first to comply with tokens that implement the anti frontrunning approval fix.
-    IERC20(debtAsset).safeApprove(address(LENDING_POOL), 0);
-    IERC20(debtAsset).safeApprove(address(LENDING_POOL), amount);
+    IERC20(debtAsset).safeApprove(address(POOL), 0);
+    IERC20(debtAsset).safeApprove(address(POOL), amount);
     uint256 repaidAmount = IERC20(debtAsset).balanceOf(address(this));
-    LENDING_POOL.repay(debtAsset, amount, rateMode, initiator);
+    POOL.repay(debtAsset, amount, rateMode, initiator);
     repaidAmount = repaidAmount.sub(IERC20(debtAsset).balanceOf(address(this)));
 
     if (collateralAsset != debtAsset) {
@@ -219,8 +219,8 @@ contract UniswapRepayAdapter is BaseUniswapAdapter {
     }
 
     // Repay flashloan. Approves for 0 first to comply with tokens that implement the anti frontrunning approval fix.
-    IERC20(debtAsset).safeApprove(address(LENDING_POOL), 0);
-    IERC20(debtAsset).safeApprove(address(LENDING_POOL), amount.add(premium));
+    IERC20(debtAsset).safeApprove(address(POOL), 0);
+    IERC20(debtAsset).safeApprove(address(POOL), amount.add(premium));
   }
 
   /**

contracts/flashloan/base/FlashLoanReceiverBase.sol

@@ -13,10 +13,10 @@ abstract contract FlashLoanReceiverBase is IFlashLoanReceiver {
   using SafeMath for uint256;
 
   IPoolAddressesProvider public immutable override ADDRESSES_PROVIDER;
-  IPool public immutable override LENDING_POOL;
+  IPool public immutable override POOL;
 
   constructor(IPoolAddressesProvider provider) public {
     ADDRESSES_PROVIDER = provider;
-    LENDING_POOL = IPool(provider.getPool());
+    POOL = IPool(provider.getPool());
   }
 }

contracts/flashloan/interfaces/IFlashLoanReceiver.sol

@@ -21,5 +21,5 @@ interface IFlashLoanReceiver {
 
   function ADDRESSES_PROVIDER() external view returns (IPoolAddressesProvider);
 
-  function LENDING_POOL() external view returns (IPool);
+  function POOL() external view returns (IPool);
 }

contracts/misc/WETHGateway.sol

@@ -27,7 +27,7 @@ contract WETHGateway is IWETHGateway, Ownable {
     WETH = IWETH(weth);
   }
 
-  function authorizeLendingPool(address pool) external onlyOwner {
+  function authorizePool(address pool) external onlyOwner {
     WETH.approve(pool, uint256(-1));
   }
 

contracts/mocks/flashloan/MockFlashLoanReceiver.sol

@@ -74,7 +74,7 @@ contract MockFlashLoanReceiver is FlashLoanReceiverBase {
 
       token.mint(premiums[i]);
 
-      IERC20(assets[i]).approve(address(LENDING_POOL), amountToReturn);
+      IERC20(assets[i]).approve(address(POOL), amountToReturn);
     }
 
     emit ExecutedWithSuccess(assets, amounts, premiums);

contracts/protocol/pool/PoolStorage.sol

@@ -22,7 +22,7 @@ contract PoolStorage {
 
   uint256 internal _reservesCount;
 
-  // Deprecated: global LendingPool pause state, no longer used
+  // Deprecated: global Pool pause state, no longer used
   // Replaced by pause states for each reserve
   bool internal _paused;
 

contracts/protocol/tokenization/AToken.sol

@@ -42,7 +42,7 @@ contract AToken is
   address internal _underlyingAsset;
   IAaveIncentivesController internal _incentivesController;
 
-  modifier onlyLendingPool {
+  modifier onlyPool {
     require(_msgSender() == address(_pool), Errors.CT_CALLER_MUST_BE_POOL);
     _;
   }
@@ -122,7 +122,7 @@ contract AToken is
     address receiverOfUnderlying,
     uint256 amount,
     uint256 index
-  ) external override onlyLendingPool {
+  ) external override onlyPool {
     uint256 amountScaled = amount.rayDiv(index);
     require(amountScaled != 0, Errors.CT_INVALID_BURN_AMOUNT);
     _burn(user, amountScaled);
@@ -145,7 +145,7 @@ contract AToken is
     address user,
     uint256 amount,
     uint256 index
-  ) external override onlyLendingPool returns (bool) {
+  ) external override onlyPool returns (bool) {
     uint256 previousBalance = super.balanceOf(user);
 
     uint256 amountScaled = amount.rayDiv(index);
@@ -164,7 +164,7 @@ contract AToken is
    * @param amount The amount of tokens getting minted
    * @param index The new liquidity index of the reserve
    */
-  function mintToTreasury(uint256 amount, uint256 index) external override onlyLendingPool {
+  function mintToTreasury(uint256 amount, uint256 index) external override onlyPool {
     if (amount == 0) {
       return;
     }
@@ -192,7 +192,7 @@ contract AToken is
     address from,
     address to,
     uint256 value
-  ) external override onlyLendingPool {
+  ) external override onlyPool {
     // Being a normal transfer, the Transfer() and BalanceTransfer() are emitted
     // so no need to emit a specific event here
     _transfer(from, to, value, false);
@@ -308,7 +308,7 @@ contract AToken is
   function transferUnderlyingTo(address target, uint256 amount)
     external
     override
-    onlyLendingPool
+    onlyPool
     returns (uint256)
   {
     IERC20(_underlyingAsset).safeTransfer(target, amount);
@@ -320,7 +320,7 @@ contract AToken is
    * @param user The user executing the repayment
    * @param amount The amount getting repaid
    **/
-  function handleRepayment(address user, uint256 amount) external override onlyLendingPool {}
+  function handleRepayment(address user, uint256 amount) external override onlyPool {}
 
   /**
    * @dev implements the permit function as for

contracts/protocol/tokenization/StableDebtToken.sol

@@ -166,7 +166,7 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
     address onBehalfOf,
     uint256 amount,
     uint256 rate
-  ) external override onlyLendingPool returns (bool) {
+  ) external override onlyPool returns (bool) {
     MintLocalVars memory vars;
 
     if (user != onBehalfOf) {
@@ -222,7 +222,7 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
    * @param user The address of the user getting his debt burned
    * @param amount The amount of debt tokens getting burned
    **/
-  function burn(address user, uint256 amount) external override onlyLendingPool {
+  function burn(address user, uint256 amount) external override onlyPool {
     (, uint256 currentBalance, uint256 balanceIncrease) = _calculateBalanceIncrease(user);
 
     uint256 previousSupply = totalSupply();
@@ -446,7 +446,7 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
   /**
    * @dev For internal usage in the logic of the parent contracts
    **/
-  function _getLendingPool() internal view override returns (IPool) {
+  function _getPool() internal view override returns (IPool) {
     return _pool;
   }
 

contracts/protocol/tokenization/VariableDebtToken.sol

@@ -125,7 +125,7 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
     address onBehalfOf,
     uint256 amount,
     uint256 index
-  ) external override onlyLendingPool returns (bool) {
+  ) external override onlyPool returns (bool) {
     if (user != onBehalfOf) {
       _decreaseBorrowAllowance(onBehalfOf, user, amount);
     }
@@ -153,7 +153,7 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
     address user,
     uint256 amount,
     uint256 index
-  ) external override onlyLendingPool {
+  ) external override onlyPool {
     uint256 amountScaled = amount.rayDiv(index);
     require(amountScaled != 0, Errors.CT_INVALID_BURN_AMOUNT);
 
@@ -276,7 +276,7 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
     return _underlyingAsset;
   }
 
-  function _getLendingPool() internal view override returns (IPool) {
+  function _getPool() internal view override returns (IPool) {
     return _pool;
   }
 }

contracts/protocol/tokenization/base/DebtTokenBase.sol

@@ -25,8 +25,8 @@ abstract contract DebtTokenBase is
   /**
    * @dev Only pool can call functions marked by this modifier
    **/
-  modifier onlyLendingPool {
-    require(_msgSender() == address(_getLendingPool()), Errors.CT_CALLER_MUST_BE_POOL);
+  modifier onlyPool {
+    require(_msgSender() == address(_getPool()), Errors.CT_CALLER_MUST_BE_POOL);
     _;
   }
 
@@ -141,5 +141,5 @@ abstract contract DebtTokenBase is
 
   function _getUnderlyingAssetAddress() internal view virtual returns (address);
 
-  function _getLendingPool() internal view virtual returns (IPool);
+  function _getPool() internal view virtual returns (IPool);
 }