CDAuctioneer: incorrect conditional when checking auction parameters.…

… Fix tests.
OlympusDAO · Jan 7, 2025 · d736725 · d736725
1 parent fa4b099
commit d736725
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/policies/CDAuctioneer.sol b/src/policies/CDAuctioneer.sol
@@ -405,7 +405,7 @@ contract CDAuctioneer is IConvertibleDepositAuctioneer, Policy, RolesConsumer, R
 
         // Ensure that the minimum price is enforced
         // Otherwise, OHM will be converted at a price lower than the minimum
-        if (minPrice_ < _previousTick.price) {
+        if (minPrice_ > _previousTick.price) {
             _previousTick.price = minPrice_;
         }
 

diff --git a/src/test/policies/ConvertibleDepositAuctioneer/ConvertibleDepositAuctioneerTest.sol b/src/test/policies/ConvertibleDepositAuctioneer/ConvertibleDepositAuctioneerTest.sol
@@ -118,8 +118,8 @@ contract ConvertibleDepositAuctioneerTest is Test {
     function _assertPreviousTick(uint256 capacity_, uint256 price_) internal {
         IConvertibleDepositAuctioneer.Tick memory tick = auctioneer.getPreviousTick();
 
-        assertEq(tick.capacity, capacity_, "capacity");
-        assertEq(tick.price, price_, "price");
+        assertEq(tick.capacity, capacity_, "previous tick capacity");
+        assertEq(tick.price, price_, "previous tick price");
     }
 
     // ========== MODIFIERS ========== //

diff --git a/src/test/policies/ConvertibleDepositAuctioneer/setAuctionParameters.t.sol b/src/test/policies/ConvertibleDepositAuctioneer/setAuctionParameters.t.sol
@@ -51,12 +51,16 @@ contract ConvertibleDepositAuctioneerAuctionParametersTest is ConvertibleDeposit
     }
 
     function test_contractNotInitialized() public {
+        uint256 newTarget = 21e9;
+        uint256 newTickSize = 11e9;
+        uint256 newMinPrice = 14e18;
+
         // Call function
         vm.prank(heart);
-        auctioneer.setAuctionParameters(100, 101, 102);
+        auctioneer.setAuctionParameters(newTarget, newTickSize, newMinPrice);
 
         // Assert state
-        _assertAuctionParameters(100, 101, 102, 0);
+        _assertAuctionParameters(newTarget, newTickSize, newMinPrice, 0);
     }
 
     function test_targetZero() public givenInitialized {
@@ -70,7 +74,7 @@ contract ConvertibleDepositAuctioneerAuctionParametersTest is ConvertibleDeposit
 
         uint256 newTarget = 0;
         uint256 newTickSize = 11e9;
-        uint256 newMinPrice = 16e18;
+        uint256 newMinPrice = 14e18;
 
         // Expect event
         vm.expectEmit(true, true, true, true);
@@ -131,7 +135,7 @@ contract ConvertibleDepositAuctioneerAuctionParametersTest is ConvertibleDeposit
 
         uint256 newTarget = 21e9;
         uint256 newTickSize = 11e9;
-        uint256 newMinPrice = 16e18;
+        uint256 newMinPrice = 14e18;
 
         // Expect event
         vm.expectEmit(true, true, true, true);
@@ -160,7 +164,7 @@ contract ConvertibleDepositAuctioneerAuctionParametersTest is ConvertibleDeposit
 
         uint256 newTarget = 21e9;
         uint256 newTickSize = 11e9;
-        uint256 newMinPrice = 16e18;
+        uint256 newMinPrice = 14e18;
 
         // Expect event
         vm.expectEmit(true, true, true, true);