Merge branch 'master' into typo-fixes

pull/5464/merge
Arr00 6 days ago committed by GitHub
commit 9a62c3cd17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      lib/erc4626-tests
  2. 2
      lib/forge-std
  3. 2
      lib/halmos-cheatcodes
  4. 3
      test/utils/math/Math.t.sol

@ -1 +1 @@
Subproject commit 8b1d7c2ac248c33c3506b1bff8321758943c5e11
Subproject commit 232ff9ba8194e406967f52ecc5cb52ed764209e9

@ -1 +1 @@
Subproject commit 1eea5bae12ae557d589f9f0f0edae2faa47cb262
Subproject commit 3b20d60d14b343ee4f908cb8079495c07f5e8981

@ -1 +1 @@
Subproject commit c0d865508c0fee0a11b97732c5e90f9cad6b65a5
Subproject commit 7328abe100445fc53885c21d0e713b95293cf14c

@ -204,6 +204,7 @@ contract MathTest is Test {
assertEq(xyLo, qdRemLo);
}
/// forge-config: default.allow_internal_expect_revert = true
function testMulDivDomain(uint256 x, uint256 y, uint256 d) public {
(uint256 xyHi, ) = _mulHighLow(x, y);
@ -216,6 +217,7 @@ contract MathTest is Test {
}
// MOD EXP
/// forge-config: default.allow_internal_expect_revert = true
function testModExp(uint256 b, uint256 e, uint256 m) public {
if (m == 0) {
vm.expectRevert(stdError.divisionError);
@ -236,6 +238,7 @@ contract MathTest is Test {
}
}
/// forge-config: default.allow_internal_expect_revert = true
function testModExpMemory(uint256 b, uint256 e, uint256 m) public {
if (m == 0) {
vm.expectRevert(stdError.divisionError);

Loading…
Cancel
Save