From 775d003cc0bd63ac5a4af038f41b3f571d8dadd2 Mon Sep 17 00:00:00 2001 From: David Racero Date: Mon, 14 Sep 2020 15:33:24 +0200 Subject: [PATCH] Keep standard paused() name function. --- contracts/interfaces/ILendingPool.sol | 2 +- contracts/lendingpool/LendingPool.sol | 6 +++--- contracts/tokenization/AToken.sol | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contracts/interfaces/ILendingPool.sol b/contracts/interfaces/ILendingPool.sol index bf03e296..f8db5c03 100644 --- a/contracts/interfaces/ILendingPool.sol +++ b/contracts/interfaces/ILendingPool.sol @@ -388,5 +388,5 @@ interface ILendingPool { function unpause() external; - function isPaused() external view returns (bool); + function paused() external view returns (bool); } diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol index 48502b31..d623c0d3 100644 --- a/contracts/lendingpool/LendingPool.sol +++ b/contracts/lendingpool/LendingPool.sol @@ -918,20 +918,20 @@ contract LendingPool is VersionedInitializable, PausablePool, ILendingPool { * @dev pause all the Lending Pool actions */ function pause() external override onlyLendingPoolConfigurator { - _pause(); + PausablePool._pause(); } /** * @dev unpause all the Lending Pool actions */ function unpause() external override onlyLendingPoolConfigurator { - _unpause(); + PausablePool._unpause(); } /** * @dev retrieve pause status */ - function isPaused() public override view returns (bool) { + function paused() public override(PausablePool, ILendingPool) view returns (bool) { return PausablePool.paused(); } } diff --git a/contracts/tokenization/AToken.sol b/contracts/tokenization/AToken.sol index 758da2e4..c97e5666 100644 --- a/contracts/tokenization/AToken.sol +++ b/contracts/tokenization/AToken.sol @@ -160,7 +160,7 @@ contract AToken is VersionedInitializable, ERC20, IAToken { * @return true if the user can transfer amount, false otherwise **/ function isTransferAllowed(address user, uint256 amount) public override view returns (bool) { - return !POOL.isPaused() && POOL.balanceDecreaseAllowed(UNDERLYING_ASSET_ADDRESS, user, amount); + return !POOL.paused() && POOL.balanceDecreaseAllowed(UNDERLYING_ASSET_ADDRESS, user, amount); } /**