diff --git a/contracts/interfaces/ILendingPool.sol b/contracts/interfaces/ILendingPool.sol index 92cf4e9b..d62c9eb9 100644 --- a/contracts/interfaces/ILendingPool.sol +++ b/contracts/interfaces/ILendingPool.sol @@ -430,7 +430,5 @@ interface ILendingPool { function getReserves() external view returns (address[] memory); - function pause() external; - - function unpause() external; + function setPause(bool val) external; } diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol index 5700fc69..6808ecbc 100644 --- a/contracts/lendingpool/LendingPool.sol +++ b/contracts/lendingpool/LendingPool.sol @@ -1004,16 +1004,9 @@ contract LendingPool is VersionedInitializable, PausablePool, ILendingPool { } /** - * @dev pause all the Lending Pool actions + * @dev pause or unpause all the Lending Pool actions and aToken transfers */ - function pause() external override onlyLendingPoolConfigurator { - PausablePool._pause(); - } - - /** - * @dev unpause all the Lending Pool actions - */ - function unpause() external override onlyLendingPoolConfigurator { - PausablePool._unpause(); + function setPause(bool val) external override onlyLendingPoolConfigurator { + PausablePool._setPause(val); } } diff --git a/contracts/lendingpool/LendingPoolConfigurator.sol b/contracts/lendingpool/LendingPoolConfigurator.sol index 4eaf3237..2799f30a 100644 --- a/contracts/lendingpool/LendingPoolConfigurator.sol +++ b/contracts/lendingpool/LendingPoolConfigurator.sol @@ -584,16 +584,9 @@ contract LendingPoolConfigurator is VersionedInitializable { } /** - * @dev pauses LendingPool actions + * @dev pauses or unpauses LendingPool actions **/ - function pausePool() external onlyLendingPoolManager { - pool.pause(); - } - - /** - * @dev unpauses LendingPool actions - **/ - function unpausePool() external onlyLendingPoolManager { - pool.unpause(); + function setPoolPause(bool val) external onlyLendingPoolManager { + pool.setPause(val); } } diff --git a/contracts/misc/PausablePool.sol b/contracts/misc/PausablePool.sol index 8f945986..092de7da 100644 --- a/contracts/misc/PausablePool.sol +++ b/contracts/misc/PausablePool.sol @@ -26,13 +26,6 @@ contract PausablePool { bool private _paused; - /** - * @dev Initializes the contract in unpaused state. - */ - constructor() internal { - _paused = false; - } - /** * @dev Returns true if the contract is paused, and false otherwise. */ @@ -53,31 +46,6 @@ contract PausablePool { _; } - /** - * @dev Modifier to make a function callable only when the contract is paused. - * - * Requirements: - * - * - The contract must be paused. - */ - modifier whenPaused() { - // require(_paused, Errors.NOT_PAUSED); - require(_paused, '55'); - _; - } - - /** - * @dev Triggers stopped state. - * - * Requirements: - * - * - The contract must not be paused. - */ - function _pause() internal virtual whenNotPaused { - _paused = true; - emit Paused(); - } - /** * @dev Returns to normal state. * @@ -85,8 +53,12 @@ contract PausablePool { * * - The contract must be paused. */ - function _unpause() internal virtual whenPaused { - _paused = false; + function _setPause(bool val) internal virtual { + _paused = val; + if (_paused) { + emit Paused(); + return; + } emit Unpaused(); } }