Merge commit '1b7f7de963016c23730684c65681ba6b836354df' into tests-improvement

Author: makcandrov

test/TestCommonHeapOrdering.t.sol

@@ -2,8 +2,6 @@
 pragma solidity ^0.8.0;
 
 import {RandomHeap} from "./helpers/RandomHeap.sol";
-import {HeapOrdering} from "src/HeapOrdering.sol";
-import {HeapOrderingMock} from "./mocks/HeapOrderingMock.sol";
 
 abstract contract TestCommonHeapOrdering is RandomHeap {
     address[] public accounts;

test/TestHeapInvariant.t.sol

@@ -72,19 +72,13 @@ contract Heap is HeapMock, StdUtils {
 }
 
 contract TestHeapInvariant is Test {
-    /* STRUCTS */
-
     struct FuzzSelector {
         address addr;
         bytes4[] selectors;
     }
 
-    /* STORAGE */
-
     Heap public heap;
 
-    /* PUBLIC */
-
     function setUp() public {
         heap = new Heap();
     }

test/TestLogarithmicBuckets.t.sol

@@ -119,8 +119,6 @@ contract TestLogarithmicBuckets is LogarithmicBucketsMock, Test {
 }
 
 contract TestProveLogarithmicBuckets is LogarithmicBucketsMock, Test {
-    /* PUBLIC */
-
     function isPowerOfTwo(uint256 x) public pure returns (bool) {
         unchecked {
             return x != 0 && (x & (x - 1)) == 0;

test/TestLogarithmicBucketsGas.t.sol

@@ -19,8 +19,6 @@ contract TestLogarithmicBucketsGas is Test {
     uint256 internal getMatchCost;
     uint256 internal getMatchCount;
 
-    /* PUBLIC */
-
     function testGasUsage() public noGasMetering {
         for (uint256 i; i <= 10000; i++) {
             // Get a random amount.

test/TestThreeHeapOrderingInvariant.t.sol

@@ -93,8 +93,8 @@ contract TestThreeHeapOrderingInvariant is Test {
 
         for (uint256 i; i < length; ++i) {
             assertTrue((i * 3 + 1 >= length || i * 3 + 1 >= heap.size() || heap.accountsValue(i) >= heap.accountsValue(i * 3 + 1)));// forgefmt: disable-line
-            assertTrue((i * 3 + 2 >= length || i * 3 + 2 >= heap.size()|| heap.accountsValue(i) >= heap.accountsValue(i * 3 + 2)));// forgefmt: disable-line
-            assertTrue((i * 3 + 3 >= length || i * 3 + 3 >= heap.size()|| heap.accountsValue(i) >= heap.accountsValue(i * 3 + 3)));// forgefmt: disable-line
+            assertTrue((i * 3 + 2 >= length || i * 3 + 2 >= heap.size() || heap.accountsValue(i) >= heap.accountsValue(i * 3 + 2)));// forgefmt: disable-line
+            assertTrue((i * 3 + 3 >= length || i * 3 + 3 >= heap.size() || heap.accountsValue(i) >= heap.accountsValue(i * 3 + 3)));// forgefmt: disable-line
         }
     }