refactor: return 0 when no greater element

clober-dex · Jan 16, 2024 · f3ceedf · f3ceedf
1 parent 6ec3919
commit f3ceedf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/contracts/Heap.sol b/contracts/Heap.sol
@@ -91,9 +91,7 @@ library Heap {
             uint256 b1Bitmap = (MAX_UINT_256_MINUS_1 << (b0b1 & 0xff)) & heap[~b0];
             if (b1Bitmap == 0) {
                 uint256 b0Bitmap = (MAX_UINT_256_MINUS_1 << b0) & heap[B0_BITMAP_KEY];
-                if (b0Bitmap == 0) {
-                    revert EmptyError();
-                }
+                if (b0Bitmap == 0) return 0;
                 b0 = b0Bitmap.leastSignificantBit();
                 b1Bitmap = heap[~b0];
             }

diff --git a/test/foundry/Heap.t.sol b/test/foundry/Heap.t.sol
@@ -61,17 +61,15 @@ contract HeapTest is Test {
             }
             assertTrue(testWrapper.minGreaterThan(elements[i]) == elements[i + 1], "WRONG_MIN");
         }
-        vm.expectRevert(abi.encodeWithSelector(Heap.EmptyError.selector));
-        testWrapper.minGreaterThan(elements[length - 1]);
+        assertTrue(testWrapper.minGreaterThan(elements[length - 1]) == 0, "NO_MORE_MIN_VALUE");
 
         assertFalse(testWrapper.isEmpty(), "HAS_TO_BE_OCCUPIED");
         while (!testWrapper.isEmpty()) {
             _min = testWrapper.root();
             assertTrue(testWrapper.has(_min), "HEAP_HAS_ROOT");
             uint256 min;
             if (length == 1) {
-                vm.expectRevert(abi.encodeWithSelector(Heap.EmptyError.selector));
-                testWrapper.minGreaterThan(_min);
+                assertTrue(testWrapper.minGreaterThan(_min) == 0, "NO_MORE_MIN_VALUE");
             } else {
                 min = testWrapper.minGreaterThan(_min);
             }