From aee793ed5a8495b463d77014184b29e08eb12689 Mon Sep 17 00:00:00 2001 From: Vectorized Date: Sat, 31 Aug 2024 03:30:03 +0000 Subject: [PATCH] T --- .gas-snapshot | 20 ++++++++++---------- test/FixedPointMathLib.t.sol | 26 ++++++++++++++------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.gas-snapshot b/.gas-snapshot index 26e4dc6a8..10b8dfa72 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -449,10 +449,10 @@ FixedPointMathLibTest:testDist(int256,int256) (runs: 317, μ: 512, ~: 517) FixedPointMathLibTest:testDist(uint256,uint256) (runs: 317, μ: 510, ~: 506) FixedPointMathLibTest:testDistEdgeCases() (gas: 505) FixedPointMathLibTest:testDivWad() (gas: 692) -FixedPointMathLibTest:testDivWad(uint256,uint256) (runs: 317, μ: 25468, ~: 24680) +FixedPointMathLibTest:testDivWad(uint256,uint256) (runs: 317, μ: 25656, ~: 24703) FixedPointMathLibTest:testDivWadEdgeCases() (gas: 447) FixedPointMathLibTest:testDivWadUp() (gas: 2942) -FixedPointMathLibTest:testDivWadUp(uint256,uint256) (runs: 317, μ: 25487, ~: 24776) +FixedPointMathLibTest:testDivWadUp(uint256,uint256) (runs: 317, μ: 25613, ~: 24799) FixedPointMathLibTest:testDivWadUpEdgeCases() (gas: 428) FixedPointMathLibTest:testDivWadUpZeroDenominatorReverts() (gas: 3196) FixedPointMathLibTest:testDivWadZeroDenominatorReverts() (gas: 3218) @@ -468,7 +468,7 @@ FixedPointMathLibTest:testFullMulDivUp(uint256,uint256,uint256) (runs: 317, μ: FixedPointMathLibTest:testFullMulDivUpRevertsIfRoundedUpResultOverflowsCase1() (gas: 3683) FixedPointMathLibTest:testFullMulDivUpRevertsIfRoundedUpResultOverflowsCase2() (gas: 3716) FixedPointMathLibTest:testGcd() (gas: 4206) -FixedPointMathLibTest:testGcd(uint256,uint256) (runs: 317, μ: 6652, ~: 2985) +FixedPointMathLibTest:testGcd(uint256,uint256) (runs: 317, μ: 6651, ~: 2985) FixedPointMathLibTest:testIsEven(uint256) (runs: 317, μ: 497, ~: 497) FixedPointMathLibTest:testLambertW0WadAccuracy() (gas: 7160) FixedPointMathLibTest:testLambertW0WadAccuracy(uint184) (runs: 317, μ: 2362, ~: 431) @@ -507,18 +507,18 @@ FixedPointMathLibTest:testMin(uint256,uint256) (runs: 317, μ: 476, ~: 472) FixedPointMathLibTest:testMinBrutalized(uint256,uint256) (runs: 317, μ: 828, ~: 819) FixedPointMathLibTest:testMinSigned(int256,int256) (runs: 317, μ: 541, ~: 546) FixedPointMathLibTest:testMulDiv() (gas: 1845) -FixedPointMathLibTest:testMulDiv(uint256,uint256,uint256) (runs: 317, μ: 25810, ~: 24667) +FixedPointMathLibTest:testMulDiv(uint256,uint256,uint256) (runs: 317, μ: 25940, ~: 24690) FixedPointMathLibTest:testMulDivEdgeCases() (gas: 762) FixedPointMathLibTest:testMulDivUp() (gas: 2103) -FixedPointMathLibTest:testMulDivUp(uint256,uint256,uint256) (runs: 317, μ: 25822, ~: 24975) +FixedPointMathLibTest:testMulDivUp(uint256,uint256,uint256) (runs: 317, μ: 26019, ~: 24998) FixedPointMathLibTest:testMulDivUpEdgeCases() (gas: 861) FixedPointMathLibTest:testMulDivUpZeroDenominator() (gas: 3179) FixedPointMathLibTest:testMulDivZeroDenominatorReverts() (gas: 3201) FixedPointMathLibTest:testMulWad() (gas: 712) -FixedPointMathLibTest:testMulWad(uint256,uint256) (runs: 317, μ: 25627, ~: 24653) +FixedPointMathLibTest:testMulWad(uint256,uint256) (runs: 317, μ: 25793, ~: 24681) FixedPointMathLibTest:testMulWadEdgeCases() (gas: 731) FixedPointMathLibTest:testMulWadUp() (gas: 779) -FixedPointMathLibTest:testMulWadUp(uint256,uint256) (runs: 317, μ: 25700, ~: 24771) +FixedPointMathLibTest:testMulWadUp(uint256,uint256) (runs: 317, μ: 25858, ~: 24794) FixedPointMathLibTest:testMulWadUpEdgeCases() (gas: 776) FixedPointMathLibTest:testPackUnpackSci() (gas: 129317) FixedPointMathLibTest:testPackUnpackSci(uint256) (runs: 317, μ: 30425, ~: 30421) @@ -537,10 +537,10 @@ FixedPointMathLibTest:testRawSMod(int256,int256) (runs: 317, μ: 422, ~: 422) FixedPointMathLibTest:testRawSub(int256,int256) (runs: 317, μ: 463, ~: 463) FixedPointMathLibTest:testRawSub(uint256,uint256) (runs: 317, μ: 463, ~: 463) FixedPointMathLibTest:testSDivWad() (gas: 840) -FixedPointMathLibTest:testSDivWad(int256,int256) (runs: 317, μ: 25526, ~: 24798) +FixedPointMathLibTest:testSDivWad(int256,int256) (runs: 317, μ: 25582, ~: 24829) FixedPointMathLibTest:testSDivWadEdgeCases() (gas: 404) FixedPointMathLibTest:testSMulWad() (gas: 1032) -FixedPointMathLibTest:testSMulWad(int256,int256) (runs: 317, μ: 25548, ~: 24880) +FixedPointMathLibTest:testSMulWad(int256,int256) (runs: 317, μ: 25777, ~: 24903) FixedPointMathLibTest:testSMulWadEdgeCases() (gas: 1287) FixedPointMathLibTest:testSMulWadOverflowTrickDifferential(int256,int256) (runs: 317, μ: 643, ~: 654) FixedPointMathLibTest:testSci() (gas: 1838636) @@ -558,7 +558,7 @@ FixedPointMathLibTest:testSqrtWadMonotonicallyIncreasing(uint256,uint256) (runs: FixedPointMathLibTest:testTernary(bool,uint256,uint256) (runs: 317, μ: 518, ~: 514) FixedPointMathLibTest:testZeroFloorSub(uint256,uint256) (runs: 317, μ: 548, ~: 518) FixedPointMathLibTest:testZeroFloorSubCasted(uint32,uint32,uint256) (runs: 317, μ: 926, ~: 890) -FixedPointMathLibTest:test__codesize() (gas: 44524) +FixedPointMathLibTest:test__codesize() (gas: 44557) GasBurnerLibTest:testBurn() (gas: 105035) GasBurnerLibTest:testBurn(uint256) (runs: 317, μ: 43360, ~: 33294) GasBurnerLibTest:testBurnPure() (gas: 1700850) diff --git a/test/FixedPointMathLib.t.sol b/test/FixedPointMathLib.t.sol index 30de0ea83..4fef24390 100644 --- a/test/FixedPointMathLib.t.sol +++ b/test/FixedPointMathLib.t.sol @@ -1169,23 +1169,25 @@ contract FixedPointMathLibTest is SoladyTest { function _sampleEdgeCases(int256 x, int256 y) internal returns (int256, int256) { uint256 r = _randomUniform(); - if (r & 0xf00000 == uint256(0)) y = -1; - if (r & 0x0f0000 == uint256(0)) y = type(int256).min; - if (r & 0x00f000 == uint256(0)) x = -1; - if (r & 0x000f00 == uint256(0)) x = type(int256).min; - if (r & 0x0000f0 == uint256(0)) y = 0; - if (r & 0x00000f == uint256(0)) x = 0; + if (r & 0xf000000 == uint256(0)) y = -1; + if (r & 0x0f00000 == uint256(0)) y = type(int256).min; + if (r & 0x00f0000 == uint256(0)) x = -1; + if (r & 0x000f000 == uint256(0)) x = type(int256).min; + if (r & 0x0000f00 == uint256(0)) y = 0; + if (r & 0x00000f0 == uint256(0)) x = 0; + if (r & 0x000000f == uint256(0)) (x, y) = (int256(_random()), int256(_random())); return (x, y); } function _sampleEdgeCases(uint256 x, uint256 y) internal returns (uint256, uint256) { uint256 r = _randomUniform(); - if (r & 0xf00000 == uint256(0)) y = uint256(int256(-1)); - if (r & 0x0f0000 == uint256(0)) y = uint256(type(int256).min); - if (r & 0x00f000 == uint256(0)) x = uint256(int256(-1)); - if (r & 0x000f00 == uint256(0)) x = uint256(type(int256).min); - if (r & 0x0000f0 == uint256(0)) y = 0; - if (r & 0x00000f == uint256(0)) x = 0; + if (r & 0xf000000 == uint256(0)) y = uint256(int256(-1)); + if (r & 0x0f00000 == uint256(0)) y = uint256(type(int256).min); + if (r & 0x00f0000 == uint256(0)) x = uint256(int256(-1)); + if (r & 0x000f000 == uint256(0)) x = uint256(type(int256).min); + if (r & 0x0000f00 == uint256(0)) y = 0; + if (r & 0x00000f0 == uint256(0)) x = 0; + if (r & 0x000000f == uint256(0)) (x, y) = (uint256(_random()), uint256(_random())); return (x, y); }