cleanup tests

contracts/utils/math/Math.sol

@@ -283,6 +283,24 @@ library Math {
         }
     }
 
+    /**
+     * @dev Returns the modular exponentiation of the specified base, exponent and modulus (b ** e % m)
+     *
+     * Requirements:
+     * - modulus can't be zero
+     * - result should be obtained successfully
+     */
+    function modExp(uint256 b, uint256 e, uint256 m) internal view returns (uint256) {
+        if (m == 0) {
+            revert MathModulusEqualsZero();
+        }
+        (bool success, bytes memory result) = (address(5).staticcall(abi.encode(32, 32, 32, b, e, m)));
+        if (!success) {
+            revert MathModExpCannotBeCalculated();
+        }
+        return abi.decode(result, (uint256));
+    }
+
     /**
      * @dev Returns the square root of a number. If the number is not a perfect square, the value is rounded
      * towards zero.
@@ -477,26 +495,6 @@ library Math {
         }
     }
 
-    /**
-     * @dev Returns the modular exponentiation of the specified base,
-     * exponent and modulus (b ** e % m)
-     *
-     * Requirements:
-     *
-     * - modulus can't be zero
-     * - result should be obtained successfully
-     */
-    function modExp(uint256 b, uint256 e, uint256 m) internal view returns (uint256) {
-        if (m == 0) {
-            revert MathModulusEqualsZero();
-        }
-        (bool success, bytes memory result) = (address(5).staticcall(abi.encode(32, 32, 32, b, e, m)));
-        if (!success) {
-            revert MathModExpCannotBeCalculated();
-        }
-        return abi.decode(result, (uint256));
-    }
-
     /**
      * @dev Returns whether a provided rounding mode is considered rounding up for unsigned integers.
      */

test/utils/math/Math.test.js

@@ -222,33 +222,7 @@ describe('Math', function () {
     });
   });
 
-  describe('modExp', function () {
-    it('is correctly calculating modulus', async function () {
-      const base = 3n;
-      const exponent = 200n;
-      const modulus = 50n;
-      const result = 1n;
-
-      await expect(this.mock.$modExp(base, exponent, modulus)).to.not.be.revertedWithCustomError(
-        this.mock,
-        'MathModExpCannotBeCalculated',
-      );
-
-      expect(await this.mock.$modExp(base, exponent, modulus)).to.be.equal(result);
-    });
-
-    it('is correctly reverting when modulus is zero', async function () {
-      const base = 3n;
-      const exponent = 200n;
-      const modulus = 0n;
-      await expect(this.mock.$modExp(base, exponent, modulus)).to.be.revertedWithCustomError(
-        this.mock,
-        'MathModulusEqualsZero',
-      );
-    });
-  });
-
-  describe('muldiv', function () {
+  describe('mulDiv', function () {
     it('divide by 0', async function () {
       const a = 1n;
       const b = 1n;
@@ -362,6 +336,27 @@ describe('Math', function () {
     }
   });
 
+  describe('modExp', function () {
+    it('is correctly calculating modulus', async function () {
+      const base = 3n;
+      const exponent = 200n;
+      const modulus = 50n;
+
+      expect(await this.mock.$modExp(base, exponent, modulus)).to.equal(base ** exponent % modulus);
+    });
+
+    it('is correctly reverting when modulus is zero', async function () {
+      const base = 3n;
+      const exponent = 200n;
+      const modulus = 0n;
+
+      await expect(this.mock.$modExp(base, exponent, modulus)).to.be.revertedWithCustomError(
+        this.mock,
+        'MathModulusEqualsZero',
+      );
+    });
+  });
+
   describe('sqrt', function () {
     it('rounds down', async function () {
       for (const rounding of RoundingDown) {