From 38bec0b8de9980bc819baf5bff5031f2376437bf Mon Sep 17 00:00:00 2001 From: David Racero Date: Tue, 15 Sep 2020 14:21:17 +0200 Subject: [PATCH] Save some extra codesize. --- contracts/lendingpool/LendingPool.sol | 4 +--- contracts/lendingpool/LendingPoolConfigurator.sol | 1 + contracts/lendingpool/LendingPoolLiquidationManager.sol | 1 - test/pausable-functions.spec.ts | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol index 2f35fa4c..e8db77ed 100644 --- a/contracts/lendingpool/LendingPool.sol +++ b/contracts/lendingpool/LendingPool.sol @@ -993,9 +993,7 @@ contract LendingPool is VersionedInitializable, ILendingPool { address user, uint256 amount ) external override view returns (bool) { - if (_paused) { - return false; - } + whenNotPaused(); return GenericLogic.balanceDecreaseAllowed( asset, diff --git a/contracts/lendingpool/LendingPoolConfigurator.sol b/contracts/lendingpool/LendingPoolConfigurator.sol index 2799f30a..790eca96 100644 --- a/contracts/lendingpool/LendingPoolConfigurator.sol +++ b/contracts/lendingpool/LendingPoolConfigurator.sol @@ -585,6 +585,7 @@ contract LendingPoolConfigurator is VersionedInitializable { /** * @dev pauses or unpauses LendingPool actions + * @param val the boolean value to set the current pause state of LendingPool **/ function setPoolPause(bool val) external onlyLendingPoolManager { pool.setPause(val); diff --git a/contracts/lendingpool/LendingPoolLiquidationManager.sol b/contracts/lendingpool/LendingPoolLiquidationManager.sol index 2520eb4b..6adc18d9 100644 --- a/contracts/lendingpool/LendingPoolLiquidationManager.sol +++ b/contracts/lendingpool/LendingPoolLiquidationManager.sol @@ -3,7 +3,6 @@ pragma solidity ^0.6.8; import {SafeMath} from '@openzeppelin/contracts/math/SafeMath.sol'; import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol'; -import {Pausable} from '@openzeppelin/contracts/utils/Pausable.sol'; import { VersionedInitializable } from '../libraries/openzeppelin-upgradeability/VersionedInitializable.sol'; diff --git a/test/pausable-functions.spec.ts b/test/pausable-functions.spec.ts index d63ab1e2..3403491c 100644 --- a/test/pausable-functions.spec.ts +++ b/test/pausable-functions.spec.ts @@ -44,7 +44,7 @@ makeSuite('Pausable Pool', (testEnv: TestEnv) => { // User 0 tries the transfer to User 1 await expect( aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoDeposit) - ).to.revertedWith(TRANSFER_NOT_ALLOWED); + ).to.revertedWith(IS_PAUSED); const pausedFromBalance = await aDai.balanceOf(users[0].address); const pausedToBalance = await aDai.balanceOf(users[1].address);