- Simplified getter of boolean fields on ReserveConfiguration.

- Added all 256 bits to masks on ReserveConfiguration for clarity.
aave · Oct 29, 2020 · 6cd18c4 · 6cd18c4
1 parent 251bd59
commit 6cd18c4
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/contracts/libraries/configuration/ReserveConfiguration.sol b/contracts/libraries/configuration/ReserveConfiguration.sol
@@ -9,15 +9,15 @@ import {Errors} from '../helpers/Errors.sol';
  * @notice Implements the bitmap logic to handle the reserve configuration
  */
 library ReserveConfiguration {
-  uint256 constant LTV_MASK = 0xFFFFFFFFFFFFFFFF0000;
-  uint256 constant LIQUIDATION_THRESHOLD_MASK = 0xFFFFFFFFFFFF0000FFFF;
-  uint256 constant LIQUIDATION_BONUS_MASK = 0xFFFFFFFF0000FFFFFFFF;
-  uint256 constant DECIMALS_MASK = 0xFFFFFF00FFFFFFFFFFFF;
-  uint256 constant ACTIVE_MASK = 0xFFFFFEFFFFFFFFFFFFFF;
-  uint256 constant FROZEN_MASK = 0xFFFFFDFFFFFFFFFFFFFF;
-  uint256 constant BORROWING_MASK = 0xFFFFFBFFFFFFFFFFFFFF;
-  uint256 constant STABLE_BORROWING_MASK = 0xFFFFF7FFFFFFFFFFFFFF;
-  uint256 constant RESERVE_FACTOR_MASK = 0xFFFFFFFFFFFFFFFF;
+  uint256 constant LTV_MASK =                   0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000; // prettier-ignore
+  uint256 constant LIQUIDATION_THRESHOLD_MASK = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF; // prettier-ignore
+  uint256 constant LIQUIDATION_BONUS_MASK =     0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFF; // prettier-ignore
+  uint256 constant DECIMALS_MASK =              0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF; // prettier-ignore
+  uint256 constant ACTIVE_MASK =                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFF; // prettier-ignore
+  uint256 constant FROZEN_MASK =                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDFFFFFFFFFFFFFF; // prettier-ignore
+  uint256 constant BORROWING_MASK =             0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFFFFFFFFFFFF; // prettier-ignore
+  uint256 constant STABLE_BORROWING_MASK =      0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFFFFF; // prettier-ignore
+  uint256 constant RESERVE_FACTOR_MASK =        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFF; // prettier-ignore
 
   /// @dev For the LTV, the start bit is 0 (up to 15), but we don't declare it as for 0 no bit movement is needed
   uint256 constant LIQUIDATION_THRESHOLD_START_BIT_POSITION = 16;
@@ -161,7 +161,7 @@ library ReserveConfiguration {
    * @return the active state
    **/
   function getActive(ReserveConfiguration.Map storage self) internal view returns (bool) {
-    return ((self.data & ~ACTIVE_MASK) >> IS_ACTIVE_START_BIT_POSITION) != 0;
+    return (self.data & ~ACTIVE_MASK) != 0;
   }
 
   /**
@@ -181,7 +181,7 @@ library ReserveConfiguration {
    * @return the frozen state
    **/
   function getFrozen(ReserveConfiguration.Map storage self) internal view returns (bool) {
-    return ((self.data & ~FROZEN_MASK) >> IS_FROZEN_START_BIT_POSITION) != 0;
+    return (self.data & ~FROZEN_MASK) != 0;
   }
 
   /**
@@ -201,7 +201,7 @@ library ReserveConfiguration {
    * @return the borrowing state
    **/
   function getBorrowingEnabled(ReserveConfiguration.Map storage self) internal view returns (bool) {
-    return ((self.data & ~BORROWING_MASK) >> BORROWING_ENABLED_START_BIT_POSITION) != 0;
+    return (self.data & ~BORROWING_MASK) != 0;
   }
 
   /**
@@ -228,8 +228,7 @@ library ReserveConfiguration {
     view
     returns (bool)
   {
-    return
-      ((self.data & ~STABLE_BORROWING_MASK) >> STABLE_BORROWING_ENABLED_START_BIT_POSITION) != 0;
+    return (self.data & ~STABLE_BORROWING_MASK) != 0;
   }
 
   /**
@@ -275,10 +274,10 @@ library ReserveConfiguration {
     uint256 dataLocal = self.data;
 
     return (
-      (dataLocal & ~ACTIVE_MASK) >> IS_ACTIVE_START_BIT_POSITION != 0,
-      (dataLocal & ~FROZEN_MASK) >> IS_FROZEN_START_BIT_POSITION != 0,
-      (dataLocal & ~BORROWING_MASK) >> BORROWING_ENABLED_START_BIT_POSITION != 0,
-      (dataLocal & ~STABLE_BORROWING_MASK) >> STABLE_BORROWING_ENABLED_START_BIT_POSITION != 0
+      (dataLocal & ~ACTIVE_MASK) != 0,
+      (dataLocal & ~FROZEN_MASK) != 0,
+      (dataLocal & ~BORROWING_MASK) != 0,
+      (dataLocal & ~STABLE_BORROWING_MASK) != 0
     );
   }
 
@@ -350,10 +349,10 @@ library ReserveConfiguration {
     )
   {
     return (
-      (self.data & ~ACTIVE_MASK) >> IS_ACTIVE_START_BIT_POSITION != 0,
-      (self.data & ~FROZEN_MASK) >> IS_FROZEN_START_BIT_POSITION != 0,
-      (self.data & ~BORROWING_MASK) >> BORROWING_ENABLED_START_BIT_POSITION != 0,
-      (self.data & ~STABLE_BORROWING_MASK) >> STABLE_BORROWING_ENABLED_START_BIT_POSITION != 0
+      (self.data & ~ACTIVE_MASK) != 0,
+      (self.data & ~FROZEN_MASK) != 0,
+      (self.data & ~BORROWING_MASK) != 0,
+      (self.data & ~STABLE_BORROWING_MASK) != 0
     );
   }
 }