♻️ Strengthen MinHeapLib tests (ethereum#835)

Author: Vectorized

.gas-snapshot

@@ -858,27 +858,31 @@ MetadataReaderLibTest:testReadStringTruncated(uint256) (runs: 256, μ: 799541, ~
 MetadataReaderLibTest:testReadUint() (gas: 911216)
 MetadataReaderLibTest:testReadUint(uint256) (runs: 256, μ: 46033, ~: 47093)
 MetadataReaderLibTest:test__codesize() (gas: 9186)
-MinHeapLibTest:testHeapEnqueue(uint256) (runs: 256, μ: 186800, ~: 186670)
-MinHeapLibTest:testHeapEnqueue2(uint256) (runs: 256, μ: 632201, ~: 543531)
-MinHeapLibTest:testHeapEnqueueGas() (gas: 854779)
-MinHeapLibTest:testHeapPSiftTrick(uint256,uint256,uint256) (runs: 256, μ: 753, ~: 900)
-MinHeapLibTest:testHeapPushAndPop(uint256) (runs: 256, μ: 107937, ~: 99520)
-MinHeapLibTest:testHeapPushPop(uint256) (runs: 256, μ: 241058, ~: 239208)
-MinHeapLibTest:testHeapReplace(uint256) (runs: 256, μ: 293986, ~: 291470)
-MinHeapLibTest:testHeapRoot(uint256) (runs: 256, μ: 5289, ~: 5289)
-MinHeapLibTest:testHeapSmallest(uint256) (runs: 256, μ: 1622952, ~: 1248478)
-MinHeapLibTest:testHeapSmallestGas() (gas: 50027313)
-MinHeapLibTest:testMemHeapEnqueue(uint256) (runs: 256, μ: 845431, ~: 802964)
-MinHeapLibTest:testMemHeapEnqueue2(uint256) (runs: 256, μ: 820108, ~: 742000)
-MinHeapLibTest:testMemHeapEnqueueGas() (gas: 233959)
-MinHeapLibTest:testMemHeapPushAndPop(uint256) (runs: 256, μ: 813550, ~: 747797)
-MinHeapLibTest:testMemHeapPushGas() (gas: 31960)
-MinHeapLibTest:testMemHeapPushPop(uint256) (runs: 256, μ: 1057753, ~: 786232)
-MinHeapLibTest:testMemHeapReplace(uint256) (runs: 256, μ: 904829, ~: 831457)
-MinHeapLibTest:testMemHeapRoot(uint256) (runs: 256, μ: 681376, ~: 634999)
-MinHeapLibTest:testMemHeapSmallest(uint256) (runs: 256, μ: 818841, ~: 756472)
-MinHeapLibTest:testMemHeapSmallestGas() (gas: 2871496)
-MinHeapLibTest:test__codesize() (gas: 12565)
+MinHeapLibTest:testHeapEnqueue(uint256) (runs: 256, μ: 188312, ~: 192351)
+MinHeapLibTest:testHeapEnqueue2(uint256) (runs: 256, μ: 628359, ~: 566381)
+MinHeapLibTest:testHeapEnqueueGas() (gas: 854801)
+MinHeapLibTest:testHeapEnqueueZeroMaxLengthReverts(uint256) (runs: 256, μ: 47693, ~: 28615)
+MinHeapLibTest:testHeapPSiftTrick(uint256,uint256,uint256) (runs: 256, μ: 716, ~: 877)
+MinHeapLibTest:testHeapPushAndPop(uint256) (runs: 256, μ: 107245, ~: 99564)
+MinHeapLibTest:testHeapPushPop(uint256) (runs: 256, μ: 245886, ~: 244732)
+MinHeapLibTest:testHeapReplace(uint256) (runs: 256, μ: 293870, ~: 302883)
+MinHeapLibTest:testHeapReplaceOrPopEmptyHeapReverts(uint256) (runs: 256, μ: 47585, ~: 50916)
+MinHeapLibTest:testHeapRoot(uint256) (runs: 256, μ: 48520, ~: 47811)
+MinHeapLibTest:testHeapSmallest(uint256) (runs: 256, μ: 1703864, ~: 1271598)
+MinHeapLibTest:testHeapSmallestGas() (gas: 50027269)
+MinHeapLibTest:testMemHeapEnqueue(uint256) (runs: 256, μ: 857848, ~: 823530)
+MinHeapLibTest:testMemHeapEnqueue2(uint256) (runs: 256, μ: 793762, ~: 741115)
+MinHeapLibTest:testMemHeapEnqueueGas() (gas: 233981)
+MinHeapLibTest:testMemHeapEnqueueZeroMaxLengthReverts(uint256) (runs: 256, μ: 25191, ~: 24159)
+MinHeapLibTest:testMemHeapPushAndPop(uint256) (runs: 256, μ: 824109, ~: 748166)
+MinHeapLibTest:testMemHeapPushGas() (gas: 31982)
+MinHeapLibTest:testMemHeapPushPop(uint256) (runs: 256, μ: 1028744, ~: 775102)
+MinHeapLibTest:testMemHeapReplace(uint256) (runs: 256, μ: 879282, ~: 824296)
+MinHeapLibTest:testMemHeapReplaceOrPopEmptyHeapReverts(uint256) (runs: 256, μ: 25909, ~: 25517)
+MinHeapLibTest:testMemHeapRoot(uint256) (runs: 256, μ: 694847, ~: 644571)
+MinHeapLibTest:testMemHeapSmallest(uint256) (runs: 256, μ: 835597, ~: 744766)
+MinHeapLibTest:testMemHeapSmallestGas() (gas: 2871518)
+MinHeapLibTest:test__codesize() (gas: 13708)
 MulticallableTest:testMulticallableBenchmark() (gas: 29588)
 MulticallableTest:testMulticallableOriginalBenchmark() (gas: 38849)
 MulticallableTest:testMulticallablePreservesMsgSender() (gas: 11193)

test/MinHeapLib.t.sol

@@ -15,8 +15,10 @@ contract MinHeapLibTest is SoladyTest {
     MinHeapLib.Heap heap1;
 
     function testHeapRoot(uint256 x) public {
-        vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
-        heap0.root();
+        if (_random() % 2 == 0) {
+            vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
+            heap0.root();
+        }
         heap0.data.push(x);
         assertEq(heap0.length(), 1);
         assertEq(heap0.root(), x);
@@ -279,10 +281,37 @@ contract MinHeapLibTest is SoladyTest {
         }
     }
 
+    function testHeapEnqueueZeroMaxLengthReverts(uint256) public {
+        if (_random() % 2 == 0) {
+            vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
+            heap0.enqueue(_random(), 0);
+        }
+        heap0.enqueue(_random(), 1);
+    }
+
+    function testHeapReplaceOrPopEmptyHeapReverts(uint256) public {
+        if (_random() % 2 == 0) {
+            vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
+            if (_random() % 2 == 0) {
+                heap0.replace(_random());
+            } else {
+                heap0.pop();
+            }
+        }
+        heap0.push(_random());
+        if (_random() % 2 == 0) {
+            heap0.replace(_random());
+        } else {
+            heap0.pop();
+        }
+    }
+
     function testMemHeapRoot(uint256 x) public brutalizeMemory {
         MinHeapLib.MemHeap memory heapA;
-        vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
-        heapA.root();
+        if (_random() % 2 == 0) {
+            vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
+            heapA.root();
+        }
         heapA.push(x);
         assertEq(heapA.length(), 1);
         assertEq(heapA.root(), x);
@@ -474,6 +503,33 @@ contract MinHeapLibTest is SoladyTest {
         }
     }
 
+    function testMemHeapEnqueueZeroMaxLengthReverts(uint256) public {
+        MinHeapLib.MemHeap memory heapA;
+        if (_random() % 2 == 0) {
+            vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
+            heapA.enqueue(_random(), 0);
+        }
+        heapA.enqueue(_random(), 1);
+    }
+
+    function testMemHeapReplaceOrPopEmptyHeapReverts(uint256) public {
+        MinHeapLib.MemHeap memory heapA;
+        if (_random() % 2 == 0) {
+            vm.expectRevert(MinHeapLib.HeapIsEmpty.selector);
+            if (_random() % 2 == 0) {
+                heapA.replace(_random());
+            } else {
+                heapA.pop();
+            }
+        }
+        heapA.push(_random());
+        if (_random() % 2 == 0) {
+            heapA.replace(_random());
+        } else {
+            heapA.pop();
+        }
+    }
+
     function testMemHeapEnqueueGas() public pure {
         MinHeapLib.MemHeap memory heapA;
         LibPRNG.PRNG memory prng;