From b591db752cdc01914017bda9117952db0143cc0a Mon Sep 17 00:00:00 2001
From: Hadrien Charlanes <hadrien@variabl.io>
Date: Tue, 1 Jun 2021 10:11:58 +0200
Subject: [PATCH] post-merge: cleaning after conflicts resolution

---
 .../lendingpool/LendingPoolConfigurator.sol   | 25 +++----------------
 markets/matic/reservesConfigs.ts              |  2 --
 test-suites/test-aave/configurator.spec.ts    | 14 ++++-------
 3 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/contracts/protocol/lendingpool/LendingPoolConfigurator.sol b/contracts/protocol/lendingpool/LendingPoolConfigurator.sol
index dae274e8..5c8e8f46 100644
--- a/contracts/protocol/lendingpool/LendingPoolConfigurator.sol
+++ b/contracts/protocol/lendingpool/LendingPoolConfigurator.sol
@@ -35,8 +35,6 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
 
   mapping(address => bool) private _riskAdmins;
 
-  mapping(address => bool) private _riskAdmins;
-
   modifier onlyPoolAdmin {
     require(_addressesProvider.getPoolAdmin() == msg.sender, Errors.CALLER_NOT_POOL_ADMIN);
     _;
@@ -266,7 +264,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
     uint256 borrowCap,
     bool stableBorrowRateEnabled
   ) external override onlyRiskOrPoolAdmins {
-    DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);$
+    DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
 
     currentConfig.setBorrowingEnabled(true);
     currentConfig.setBorrowCap(borrowCap);
@@ -487,32 +485,15 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
     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
   function authorizeFlashBorrower(address flashBorrower) external override onlyPoolAdmin {
-    pool.authorizeFlashBorrower(flashBorrower);
+    _pool.authorizeFlashBorrower(flashBorrower);
     emit FlashBorrowerAuthorized(flashBorrower);
   }
 
   /// @inheritdoc ILendingPoolConfigurator
   function unauthorizeFlashBorrower(address flashBorrower) external override onlyPoolAdmin {
-    pool.unauthorizeFlashBorrower(flashBorrower);
+    _pool.unauthorizeFlashBorrower(flashBorrower);
     emit FlashBorrowerUnauthorized(flashBorrower);
   }
 
diff --git a/markets/matic/reservesConfigs.ts b/markets/matic/reservesConfigs.ts
index 285a2713..cbeba1a6 100644
--- a/markets/matic/reservesConfigs.ts
+++ b/markets/matic/reservesConfigs.ts
@@ -92,8 +92,6 @@ export const strategyMATIC: IReserveParams = {
   borrowCap: '0',
   supplyCap: '0',
   reserveFactor: '2000',
-  borrowCap: MAX_BORROW_CAP,
-  supplyCap: MAX_SUPPLY_CAP,
 };
 
 export const strategyAAVE: IReserveParams = {
diff --git a/test-suites/test-aave/configurator.spec.ts b/test-suites/test-aave/configurator.spec.ts
index a941e3ef..bff8b02a 100644
--- a/test-suites/test-aave/configurator.spec.ts
+++ b/test-suites/test-aave/configurator.spec.ts
@@ -134,14 +134,8 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
     expect(supplyCap).to.be.equal(strategyWETH.supplyCap);
   });
   it('Pauses the ETH reserve by emergency admin', async () => {
-    const {
-      configurator,
-      weth,
-      helpersContract,
-      addressesProvider,
-      users,
-      emergencyAdmin,
-    } = testEnv;
+    const { configurator, weth, helpersContract, addressesProvider, users, emergencyAdmin } =
+      testEnv;
     await configurator.connect(emergencyAdmin.signer).pauseReserve(weth.address);
     const {
       decimals,
@@ -218,7 +212,9 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
       CALLER_NOT_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);
     const {
       decimals,