Remove bucket depth constraint, add test for settle called with 0 buc…

…kets (settle only with reserves)
ajna-finance · Mar 1, 2023 · e87949c · e87949c
1 parent 05826d6
commit e87949c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 27 deletions.
diff --git a/src/interfaces/pool/commons/IPoolErrors.sol b/src/interfaces/pool/commons/IPoolErrors.sol
@@ -107,11 +107,6 @@ interface IPoolErrors {
      */
     error InsufficientLiquidity();
 
-    /**
-     *  @notice When settling pool debt the number of buckets to use should be greater than 0.
-     */
-    error InvalidBucketDepth();
-
     /**
      *  @notice When transferring LPs between indices, the new index must be a valid index.
      */

diff --git a/src/libraries/external/Auctions.sol b/src/libraries/external/Auctions.sol
@@ -162,7 +162,6 @@ library Auctions {
     error CollateralRoundingNeededButNotPossible();
     error InsufficientLiquidity();
     error InsufficientCollateral();
-    error InvalidBucketDepth();
     error InvalidAmount();
     error NoAuction();
     error NoReserves();
@@ -207,9 +206,6 @@ library Auctions {
         uint256 collateralSettled_,
         uint256 t0DebtSettled_
     ) {
-        // revert if no bucket to settle
-        if (params_.bucketDepth == 0 ) revert InvalidBucketDepth();
-
         uint256 kickTime = auctions_.liquidations[params_.borrower].kickTime;
         if (kickTime == 0) revert NoAuction();
 

diff --git a/tests/forge/ERC20Pool/ERC20PoolInputValidation.t.sol b/tests/forge/ERC20Pool/ERC20PoolInputValidation.t.sol
@@ -82,12 +82,6 @@ contract ERC20PoolBorrowTest is ERC20HelperContract {
         ERC20Pool(address(_pool)).removeCollateral(0, 1000);
     }
 
-    function testValidateSettleInput() external tearDown {
-        // revert on zero amount
-        vm.expectRevert(IPoolErrors.InvalidBucketDepth.selector);
-        ERC20Pool(address(_pool)).settle(address(this), 0);
-    }
-
     function testValidateTakeInput() external tearDown {
         // revert on zero amount
         vm.expectRevert(IPoolErrors.InvalidAmount.selector);

diff --git a/tests/forge/ERC20Pool/ERC20PoolLiquidationsTake.t.sol b/tests/forge/ERC20Pool/ERC20PoolLiquidationsTake.t.sol
@@ -1576,22 +1576,29 @@ contract ERC20PoolLiquidationsTakeTest is ERC20HelperContract {
             auctionPrice:               0,
             timeRemaining:              0
         });
-
-        // partial clears / debt settled - max buckets to use is 1, remaining will be taken from reserves
+        // partial clears / debt settled - max buckets to use is 0, settle only from reserves
         _settle({
             from:        _lender,
             borrower:    _borrower2,
-            maxDepth:    1,
-            settledDebt: 2_923.975862386543877283 * 1e18
+            maxDepth:    0,
+            settledDebt: 834 * 1e18
         });
-
         _assertReserveAuction({
-            reserves:                   0.989870342666661239 * 1e18,
+            reserves:                   0.989870342666662235 * 1e18,
             claimableReserves :         0,
             claimableReservesRemaining: 0,
             auctionPrice:               0,
             timeRemaining:              0
         });
+
+        // partial clears / debt settled with max buckets to use is 1
+        _settle({
+            from:        _lender,
+            borrower:    _borrower2,
+            maxDepth:    1,
+            settledDebt: 2_089.975862386543877283 * 1e18
+        });
+
         _assertAuction(
             AuctionParams({
                 borrower:          _borrower2,

diff --git a/tests/forge/ERC721Pool/ERC721PoolInputValidation.t.sol b/tests/forge/ERC721Pool/ERC721PoolInputValidation.t.sol
@@ -90,12 +90,6 @@ contract ERC721PoolBorrowTest is ERC721HelperContract {
         ERC721Pool(address(_pool)).removeCollateral(0, 1000);
     }
 
-    function testValidateSettleInput() external tearDown {
-        // revert on zero amount
-        vm.expectRevert(IPoolErrors.InvalidBucketDepth.selector);
-        ERC721Pool(address(_pool)).settle(address(this), 0);
-    }
-
     function testValidateTakeInput() external tearDown {
         // revert on zero amount
         vm.expectRevert(IPoolErrors.InvalidAmount.selector);