NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update forge and change visibility in fuzz tests (#5103)

Browse Source 
Co-authored-by: cairo <cairoeth@protonmail.com>
This commit is contained in:
Ernesto García
2024-10-28 10:33:25 -06:00
committed by GitHub
parent bcdfa848a6
commit f96237308f
16 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/utils/math/Math.t.sol
View File

@ -7,18 +7,18 @@ import {Test, stdError} from "forge-std/Test.sol";
import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
contract MathTest is Test {
function testSymbolicTernary(bool f, uint256 a, uint256 b) public {
function testSymbolicTernary(bool f, uint256 a, uint256 b) public pure {
assertEq(Math.ternary(f, a, b), f ? a : b);
}
// MIN & MAX
function testSymbolicMinMax(uint256 a, uint256 b) public {
function testSymbolicMinMax(uint256 a, uint256 b) public pure {
assertEq(Math.min(a, b), a < b ? a : b);
assertEq(Math.max(a, b), a > b ? a : b);
}
// CEILDIV
function testCeilDiv(uint256 a, uint256 b) public {
function testCeilDiv(uint256 a, uint256 b) public pure {
vm.assume(b > 0);
uint256 result = Math.ceilDiv(a, b);
@ -35,7 +35,7 @@ contract MathTest is Test {
}
// SQRT
function testSqrt(uint256 input, uint8 r) public {
function testSqrt(uint256 input, uint8 r) public pure {
Math.Rounding rounding = _asRounding(r);
uint256 result = Math.sqrt(input, rounding);
@ -66,31 +66,31 @@ contract MathTest is Test {
}
// INV
function testInvMod(uint256 value, uint256 p) public {
function testInvMod(uint256 value, uint256 p) public pure {
_testInvMod(value, p, true);
}
function testInvMod2(uint256 seed) public {
function testInvMod2(uint256 seed) public pure {
uint256 p = 2; // prime
_testInvMod(bound(seed, 1, p - 1), p, false);
}
function testInvMod17(uint256 seed) public {
function testInvMod17(uint256 seed) public pure {
uint256 p = 17; // prime
_testInvMod(bound(seed, 1, p - 1), p, false);
}
function testInvMod65537(uint256 seed) public {
function testInvMod65537(uint256 seed) public pure {
uint256 p = 65537; // prime
_testInvMod(bound(seed, 1, p - 1), p, false);
}
function testInvModP256(uint256 seed) public {
function testInvModP256(uint256 seed) public pure {
uint256 p = 0xffffffff00000001000000000000000000000000ffffffffffffffffffffffff; // prime
_testInvMod(bound(seed, 1, p - 1), p, false);
}
function _testInvMod(uint256 value, uint256 p, bool allowZero) private {
function _testInvMod(uint256 value, uint256 p, bool allowZero) private pure {
uint256 inverse = Math.invMod(value, p);
if (inverse != 0) {
assertEq(mulmod(value, inverse, p), 1);
@ -101,7 +101,7 @@ contract MathTest is Test {
}
// LOG2
function testLog2(uint256 input, uint8 r) public {
function testLog2(uint256 input, uint8 r) public pure {
Math.Rounding rounding = _asRounding(r);
uint256 result = Math.log2(input, rounding);
@ -128,7 +128,7 @@ contract MathTest is Test {
}
// LOG10
function testLog10(uint256 input, uint8 r) public {
function testLog10(uint256 input, uint8 r) public pure {
Math.Rounding rounding = _asRounding(r);
uint256 result = Math.log10(input, rounding);
@ -155,7 +155,7 @@ contract MathTest is Test {
}
// LOG256
function testLog256(uint256 input, uint8 r) public {
function testLog256(uint256 input, uint8 r) public pure {
Math.Rounding rounding = _asRounding(r);
uint256 result = Math.log256(input, rounding);
@ -182,7 +182,7 @@ contract MathTest is Test {
}
// MULDIV
function testMulDiv(uint256 x, uint256 y, uint256 d) public {
function testMulDiv(uint256 x, uint256 y, uint256 d) public pure {
// Full precision for x * y
(uint256 xyHi, uint256 xyLo) = _mulHighLow(x, y);
@ -225,7 +225,7 @@ contract MathTest is Test {
assertEq(result, _nativeModExp(b, e, m));
}
function testTryModExp(uint256 b, uint256 e, uint256 m) public {
function testTryModExp(uint256 b, uint256 e, uint256 m) public view {
(bool success, uint256 result) = Math.tryModExp(b, e, m);
assertEq(success, m != 0);
if (success) {
@ -247,7 +247,7 @@ contract MathTest is Test {
assertEq(res, _nativeModExp(b, e, m));
}
function testTryModExpMemory(uint256 b, uint256 e, uint256 m) public {
function testTryModExpMemory(uint256 b, uint256 e, uint256 m) public view {
(bool success, bytes memory result) = Math.tryModExp(
abi.encodePacked(b),
abi.encodePacked(e),

14
test/utils/math/SignedMath.t.sol
View File

@ -8,18 +8,18 @@ import {Math} from "../../../contracts/utils/math/Math.sol";
import {SignedMath} from "../../../contracts/utils/math/SignedMath.sol";
contract SignedMathTest is Test {
function testSymbolicTernary(bool f, int256 a, int256 b) public {
function testSymbolicTernary(bool f, int256 a, int256 b) public pure {
assertEq(SignedMath.ternary(f, a, b), f ? a : b);
}
// MIN & MAX
function testSymbolicMinMax(int256 a, int256 b) public {
function testSymbolicMinMax(int256 a, int256 b) public pure {
assertEq(SignedMath.min(a, b), a < b ? a : b);
assertEq(SignedMath.max(a, b), a > b ? a : b);
}
// MIN
function testSymbolicMin(int256 a, int256 b) public {
function testSymbolicMin(int256 a, int256 b) public pure {
int256 result = SignedMath.min(a, b);
assertLe(result, a);
@ -28,7 +28,7 @@ contract SignedMathTest is Test {
}
// MAX
function testSymbolicMax(int256 a, int256 b) public {
function testSymbolicMax(int256 a, int256 b) public pure {
int256 result = SignedMath.max(a, b);
assertGe(result, a);
@ -38,7 +38,7 @@ contract SignedMathTest is Test {
// AVERAGE
// 1. simple test, not full int256 range
function testAverage1(int256 a, int256 b) public {
function testAverage1(int256 a, int256 b) public pure {
a = bound(a, type(int256).min / 2, type(int256).max / 2);
b = bound(b, type(int256).min / 2, type(int256).max / 2);
@ -48,7 +48,7 @@ contract SignedMathTest is Test {
}
// 2. more complex test, full int256 range
function testAverage2(int256 a, int256 b) public {
function testAverage2(int256 a, int256 b) public pure {
(int256 result, int256 min, int256 max) = (
SignedMath.average(a, b),
SignedMath.min(a, b),
@ -69,7 +69,7 @@ contract SignedMathTest is Test {
}
// ABS
function testSymbolicAbs(int256 a) public {
function testSymbolicAbs(int256 a) public pure {
uint256 result = SignedMath.abs(a);
unchecked {