Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

post-merge: cleaning after conflicts resolution

Browse Source
This commit is contained in:
Hadrien Charlanes 2021-06-01 10:11:58 +02:00
parent ad6f2d2ede
commit b591db752c
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
contracts/protocol/lendingpool/LendingPoolConfigurator.sol
View File

@ -35,8 +35,6 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
mapping(address => bool) private _riskAdmins; mapping(address => bool) private _riskAdmins;
mapping(address => bool) private _riskAdmins;
modifier onlyPoolAdmin { modifier onlyPoolAdmin {
require(_addressesProvider.getPoolAdmin() == msg.sender, Errors.CALLER_NOT_POOL_ADMIN); require(_addressesProvider.getPoolAdmin() == msg.sender, Errors.CALLER_NOT_POOL_ADMIN);
_; _;
@ -266,7 +264,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
uint256 borrowCap, uint256 borrowCap,
bool stableBorrowRateEnabled bool stableBorrowRateEnabled
) external override onlyRiskOrPoolAdmins { ) external override onlyRiskOrPoolAdmins {
DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);$ DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
currentConfig.setBorrowingEnabled(true); currentConfig.setBorrowingEnabled(true);
currentConfig.setBorrowCap(borrowCap); currentConfig.setBorrowCap(borrowCap);
@ -487,32 +485,15 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
emit RiskAdminUnregistered(admin); emit RiskAdminUnregistered(admin);
} }
/// @inheritdoc ILendingPoolConfigurator
function isRiskAdmin(address admin) external view override onlyPoolAdmin returns (bool) {
return _riskAdmins[admin];
}
/// @inheritdoc ILendingPoolConfigurator
function registerRiskAdmin(address admin) external override onlyPoolAdmin {
_riskAdmins[admin] = true;
emit RiskAdminRegistered(admin);
}
/// @inheritdoc ILendingPoolConfigurator
function unregisterRiskAdmin(address admin) external override onlyPoolAdmin {
_riskAdmins[admin] = false;
emit RiskAdminUnregistered(admin);
}
/// @inheritdoc ILendingPoolConfigurator /// @inheritdoc ILendingPoolConfigurator
function authorizeFlashBorrower(address flashBorrower) external override onlyPoolAdmin { function authorizeFlashBorrower(address flashBorrower) external override onlyPoolAdmin {
pool.authorizeFlashBorrower(flashBorrower); _pool.authorizeFlashBorrower(flashBorrower);
emit FlashBorrowerAuthorized(flashBorrower); emit FlashBorrowerAuthorized(flashBorrower);
} }
/// @inheritdoc ILendingPoolConfigurator /// @inheritdoc ILendingPoolConfigurator
function unauthorizeFlashBorrower(address flashBorrower) external override onlyPoolAdmin { function unauthorizeFlashBorrower(address flashBorrower) external override onlyPoolAdmin {
pool.unauthorizeFlashBorrower(flashBorrower); _pool.unauthorizeFlashBorrower(flashBorrower);
emit FlashBorrowerUnauthorized(flashBorrower); emit FlashBorrowerUnauthorized(flashBorrower);
} }

2
markets/matic/reservesConfigs.ts
View File

@ -92,8 +92,6 @@ export const strategyMATIC: IReserveParams = {
borrowCap: '0', borrowCap: '0',
supplyCap: '0', supplyCap: '0',
reserveFactor: '2000', reserveFactor: '2000',
borrowCap: MAX_BORROW_CAP,
supplyCap: MAX_SUPPLY_CAP,
}; };
export const strategyAAVE: IReserveParams = { export const strategyAAVE: IReserveParams = {

14
test-suites/test-aave/configurator.spec.ts
View File

@ -134,14 +134,8 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
expect(supplyCap).to.be.equal(strategyWETH.supplyCap); expect(supplyCap).to.be.equal(strategyWETH.supplyCap);
}); });
it('Pauses the ETH reserve by emergency admin', async () => { it('Pauses the ETH reserve by emergency admin', async () => {
const { const { configurator, weth, helpersContract, addressesProvider, users, emergencyAdmin } =
configurator, testEnv;
weth,
helpersContract,
addressesProvider,
users,
emergencyAdmin,
} = testEnv;
await configurator.connect(emergencyAdmin.signer).pauseReserve(weth.address); await configurator.connect(emergencyAdmin.signer).pauseReserve(weth.address);
const { const {
decimals, decimals,
@ -218,7 +212,9 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
CALLER_NOT_POOL_ADMIN CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(LPC_CALLER_NOT_EMERGENCY_OR_POOL_ADMIN); ).to.be.revertedWith(LPC_CALLER_NOT_EMERGENCY_OR_POOL_ADMIN);
}); });
it('Pauses the ETH reserve by the pool admin', async () => {
const { configurator, weth, helpersContract, addressesProvider, users, emergencyAdmin } =
testEnv;
await configurator.pauseReserve(weth.address); await configurator.pauseReserve(weth.address);
const { const {
decimals, decimals,