fix: Move dropReserve() into PoolHelperLogic library

aave · Aug 3, 2021 · 38a9904 · 38a9904
1 parent df1f197
commit 38a9904
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/contracts/protocol/libraries/logic/PoolHelperLogic.sol b/contracts/protocol/libraries/logic/PoolHelperLogic.sol
@@ -151,4 +151,22 @@ library PoolHelperLogic {
       emit ReserveUsedAsCollateralDisabled(asset, msg.sender);
     }
   }
+
+  function dropReserve(
+    mapping(address => DataTypes.ReserveData) storage reserves,
+    mapping(uint256 => address) storage reservesList,
+    address asset
+  ) public {
+    ValidationLogic.validateDropReserve(reserves[asset]);
+    _removeReserveFromList(reserves, reservesList, asset);
+    delete reserves[asset];
+  }
+
+  function _removeReserveFromList(
+    mapping(address => DataTypes.ReserveData) storage reserves,
+    mapping(uint256 => address) storage reservesList,
+    address asset
+  ) internal {
+    reservesList[reserves[asset].id] = address(0);
+  }
 }
diff --git a/contracts/protocol/pool/Pool.sol b/contracts/protocol/pool/Pool.sol
@@ -583,9 +583,7 @@ contract Pool is VersionedInitializable, IPool, PoolStorage {
 
   ///@inheritdoc IPool
   function dropReserve(address asset) external override onlyPoolConfigurator {
-    ValidationLogic.validateDropReserve(_reserves[asset]);
-    _removeReserveFromList(asset);
-    delete _reserves[asset];
+    PoolHelperLogic.dropReserve(_reserves, _reservesList, asset);
   }
 
   ///@inheritdoc IPool
@@ -733,8 +731,4 @@ contract Pool is VersionedInitializable, IPool, PoolStorage {
       }
     }
   }
-
-  function _removeReserveFromList(address asset) internal {
-    _reservesList[_reserves[asset].id] = address(0);
-  }
 }