feat: revert on not yet set rate

morpho-org · Feb 5, 2024 · 0cb5741 · 0cb5741
1 parent 6ae27d9
commit 0cb5741
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/FixedRateIrm.sol b/src/FixedRateIrm.sol
@@ -20,8 +20,10 @@ contract FixedRateIrm is IFixedRateIrm {
 
     /* ERRORS */
 
+    /// @dev Thrown when the rate is not already set for this market.
+    string public constant RATE_NOT_SET = "rate not set";
     /// @dev Thrown when the rate is already set for this market.
-    string public constant RATE_ALREADY_SET = "rate already set";
+    string public constant RATE_SET = "rate set";
     /// @dev Thrown when trying to set the rate at zero.
     string public constant RATE_ZERO = "rate zero";
 
@@ -34,7 +36,7 @@ contract FixedRateIrm is IFixedRateIrm {
 
     /// @inheritdoc IFixedRateIrm
     function setBorrowRate(Id id, uint256 newBorrowRate) external {
-        require(_borrowRate[id] == 0, RATE_ALREADY_SET);
+        require(_borrowRate[id] == 0, RATE_SET);
         require(newBorrowRate != 0, RATE_ZERO);
 
         _borrowRate[id] = newBorrowRate;
@@ -46,11 +48,15 @@ contract FixedRateIrm is IFixedRateIrm {
 
     /// @inheritdoc IIrm
     function borrowRateView(MarketParams memory marketParams, Market memory) external view returns (uint256) {
-        return _borrowRate[marketParams.id()];
+        uint256 borrowRateCached = _borrowRate[marketParams.id()];
+        require(borrowRateCached != 0, RATE_NOT_SET);
+        return borrowRateCached;
     }
 
     /// @inheritdoc IIrm
     function borrowRate(MarketParams memory marketParams, Market memory) external view returns (uint256) {
-        return _borrowRate[marketParams.id()];
+        uint256 borrowRateCached = _borrowRate[marketParams.id()];
+        require(borrowRateCached != 0, RATE_NOT_SET);
+        return borrowRateCached;
     }
 }
diff --git a/test/forge/FixedRateIrmTest.sol b/test/forge/FixedRateIrmTest.sol
@@ -35,7 +35,7 @@ contract FixedRateIrmTest is Test {
         vm.assume(newBorrowRate1 != 0);
         vm.assume(newBorrowRate2 != 0);
         fixedRateIrm.setBorrowRate(id, newBorrowRate1);
-        vm.expectRevert("rate already set");
+        vm.expectRevert("rate set");
         fixedRateIrm.setBorrowRate(id, newBorrowRate2);
     }
 
@@ -50,11 +50,25 @@ contract FixedRateIrmTest is Test {
         assertEq(fixedRateIrm.borrowRate(marketParams, market), newBorrowRate);
     }
 
+    function testBorrowRateRateZero(MarketParams memory marketParams, Market memory market, uint256 newBorrowRate)
+        external
+    {
+        vm.expectRevert("rate not set");
+        fixedRateIrm.borrowRate(marketParams, market);
+    }
+
     function testBorrowRateView(MarketParams memory marketParams, Market memory market, uint256 newBorrowRate)
         external
     {
         vm.assume(newBorrowRate != 0);
         fixedRateIrm.setBorrowRate(marketParams.id(), newBorrowRate);
         assertEq(fixedRateIrm.borrowRateView(marketParams, market), newBorrowRate);
     }
+
+    function testBorrowRateViewRateZero(MarketParams memory marketParams, Market memory market, uint256 newBorrowRate)
+        external
+    {
+        vm.expectRevert("rate not set");
+        fixedRateIrm.borrowRateView(marketParams, market);
+    }
 }