chore: Reorder BorrowerOperations require functions

liquity · Sep 3, 2024 · 5a1eee7 · 5a1eee7
1 parent f713a97
commit 5a1eee7
Showing 1 changed file with 43 additions and 43 deletions.
diff --git a/contracts/src/BorrowerOperations.sol b/contracts/src/BorrowerOperations.sol
@@ -1300,49 +1300,6 @@ contract BorrowerOperations is LiquityBase, AddRemoveManagers, IBorrowerOperatio
         return batchManager;
     }
 
-    function _requireOrderedRange(uint256 _minInterestRate, uint256 _maxInterestRate) internal pure {
-        if (_minInterestRate >= _maxInterestRate) revert MinGeMax();
-    }
-
-    function _requireInterestRateInDelegateRange(uint256 _troveId, uint256 _annualInterestRate) internal view {
-        InterestIndividualDelegate memory individualDelegate = interestIndividualDelegateOf[_troveId];
-        if (individualDelegate.account != address(0)) {
-            _requireInterestRateInRange(
-                _annualInterestRate, individualDelegate.minInterestRate, individualDelegate.maxInterestRate
-            );
-        }
-    }
-
-    function _requireInterestRateInBatchManagerRange(address _interestBatchManagerAddress, uint256 _annualInterestRate)
-        internal
-        view
-    {
-        InterestBatchManager memory interestBatchManager = interestBatchManagers[_interestBatchManagerAddress];
-        _requireInterestRateInRange(
-            _annualInterestRate, interestBatchManager.minInterestRate, interestBatchManager.maxInterestRate
-        );
-    }
-
-    function _requireInterestRateInRange(
-        uint256 _annualInterestRate,
-        uint256 _minInterestRate,
-        uint256 _maxInterestRate
-    ) internal pure {
-        if (_minInterestRate > _annualInterestRate || _annualInterestRate > _maxInterestRate) {
-            revert InterestNotInRange();
-        }
-    }
-
-    function _requireInterestRateChangePeriodPassed(
-        address _interestBatchManagerAddress,
-        uint256 _lastInterestRateAdjTime
-    ) internal view {
-        InterestBatchManager memory interestBatchManager = interestBatchManagers[_interestBatchManagerAddress];
-        if (block.timestamp < _lastInterestRateAdjTime + uint256(interestBatchManager.minInterestRateChangePeriod)) {
-            revert BatchInterestRateChangePeriodNotPassed();
-        }
-    }
-
     function _requireTroveIsOpen(ITroveManager _troveManager, uint256 _troveId) internal view {
         ITroveManager.Status status = _troveManager.getTroveStatus(_troveId);
         if (status != ITroveManager.Status.active && status != ITroveManager.Status.unredeemable) {
@@ -1479,6 +1436,49 @@ contract BorrowerOperations is LiquityBase, AddRemoveManagers, IBorrowerOperatio
         }
     }
 
+    function _requireOrderedRange(uint256 _minInterestRate, uint256 _maxInterestRate) internal pure {
+        if (_minInterestRate >= _maxInterestRate) revert MinGeMax();
+    }
+
+    function _requireInterestRateInDelegateRange(uint256 _troveId, uint256 _annualInterestRate) internal view {
+        InterestIndividualDelegate memory individualDelegate = interestIndividualDelegateOf[_troveId];
+        if (individualDelegate.account != address(0)) {
+            _requireInterestRateInRange(
+                _annualInterestRate, individualDelegate.minInterestRate, individualDelegate.maxInterestRate
+            );
+        }
+    }
+
+    function _requireInterestRateInBatchManagerRange(address _interestBatchManagerAddress, uint256 _annualInterestRate)
+        internal
+        view
+    {
+        InterestBatchManager memory interestBatchManager = interestBatchManagers[_interestBatchManagerAddress];
+        _requireInterestRateInRange(
+            _annualInterestRate, interestBatchManager.minInterestRate, interestBatchManager.maxInterestRate
+        );
+    }
+
+    function _requireInterestRateInRange(
+        uint256 _annualInterestRate,
+        uint256 _minInterestRate,
+        uint256 _maxInterestRate
+    ) internal pure {
+        if (_minInterestRate > _annualInterestRate || _annualInterestRate > _maxInterestRate) {
+            revert InterestNotInRange();
+        }
+    }
+
+    function _requireInterestRateChangePeriodPassed(
+        address _interestBatchManagerAddress,
+        uint256 _lastInterestRateAdjTime
+    ) internal view {
+        InterestBatchManager memory interestBatchManager = interestBatchManagers[_interestBatchManagerAddress];
+        if (block.timestamp < _lastInterestRateAdjTime + uint256(interestBatchManager.minInterestRateChangePeriod)) {
+            revert BatchInterestRateChangePeriodNotPassed();
+        }
+    }
+
     function _requireValidInterestBatchManager(address _interestBatchManagerAddress) internal view {
         if (interestBatchManagers[_interestBatchManagerAddress].maxInterestRate == 0) {
             revert InvalidInterestBatchManager();