From e93ed15a4959c4321afcb51784342a5610106013 Mon Sep 17 00:00:00 2001 From: Veliko Minkov <2662912+vminkov@users.noreply.github.com> Date: Thu, 23 Jun 2022 12:33:12 +0300 Subject: [PATCH 1/8] functions clashing with forge-std/Test.sol --- src/test/utils/DSTestPlus.sol | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/test/utils/DSTestPlus.sol b/src/test/utils/DSTestPlus.sol index bb1772d4..ed0722c1 100644 --- a/src/test/utils/DSTestPlus.sol +++ b/src/test/utils/DSTestPlus.sol @@ -63,12 +63,7 @@ contract DSTestPlus is DSTest { emit log_named_uint(string(abi.encodePacked(checkpointLabel, " Gas")), gasDelta); } - function fail(string memory err) internal virtual { - emit log_named_string("Error", err); - fail(); - } - - function assertFalse(bool data) internal virtual { + function _assertFalse(bool data) private { assertTrue(!data); } @@ -89,7 +84,7 @@ contract DSTestPlus is DSTest { } function assertBoolEq(bool a, bool b) internal virtual { - b ? assertTrue(a) : assertFalse(a); + b ? assertTrue(a) : _assertFalse(a); } function assertApproxEq( @@ -145,26 +140,6 @@ contract DSTestPlus is DSTest { } } - function bound( - uint256 x, - uint256 min, - uint256 max - ) internal returns (uint256 result) { - require(max >= min, "MAX_LESS_THAN_MIN"); - - uint256 size = max - min; - - if (size == 0) result = min; - else if (size == type(uint256).max) result = x; - else { - ++size; // Make max inclusive. - uint256 mod = x % size; - result = min + mod; - } - - emit log_named_uint("Bound Result", result); - } - function min3( uint256 a, uint256 b, From 6cc160bbdfad0654d26fe6dcf79e209e519163e8 Mon Sep 17 00:00:00 2001 From: Veliko Minkov <2662912+vminkov@users.noreply.github.com> Date: Thu, 23 Jun 2022 14:27:05 +0300 Subject: [PATCH 2/8] reverting changes to make the fn virtual --- .gitignore | 3 ++- src/test/utils/DSTestPlus.sol | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5dfe93fb..2b16dd73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cache /node_modules -/out \ No newline at end of file +/out +solmate.iml diff --git a/src/test/utils/DSTestPlus.sol b/src/test/utils/DSTestPlus.sol index ed0722c1..8a677394 100644 --- a/src/test/utils/DSTestPlus.sol +++ b/src/test/utils/DSTestPlus.sol @@ -63,7 +63,12 @@ contract DSTestPlus is DSTest { emit log_named_uint(string(abi.encodePacked(checkpointLabel, " Gas")), gasDelta); } - function _assertFalse(bool data) private { + function fail(string memory err) internal virtual { + emit log_named_string("Error", err); + fail(); + } + + function assertFalse(bool data) internal virtual { assertTrue(!data); } @@ -84,7 +89,7 @@ contract DSTestPlus is DSTest { } function assertBoolEq(bool a, bool b) internal virtual { - b ? assertTrue(a) : _assertFalse(a); + b ? assertTrue(a) : assertFalse(a); } function assertApproxEq( @@ -140,6 +145,26 @@ contract DSTestPlus is DSTest { } } + function bound( + uint256 x, + uint256 min, + uint256 max + ) internal virtual returns (uint256 result) { + require(max >= min, "MAX_LESS_THAN_MIN"); + + uint256 size = max - min; + + if (size == 0) result = min; + else if (size == type(uint256).max) result = x; + else { + ++size; // Make max inclusive. + uint256 mod = x % size; + result = min + mod; + } + + emit log_named_uint("Bound Result", result); + } + function min3( uint256 a, uint256 b, From 5922b05409d6ff41d6252588ca72707847f21ab2 Mon Sep 17 00:00:00 2001 From: Veliko Minkov <2662912+vminkov@users.noreply.github.com> Date: Thu, 23 Jun 2022 18:37:40 +0300 Subject: [PATCH 3/8] changing the visibility to mathc forge-std/Test.sol --- src/test/utils/DSTestPlus.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/utils/DSTestPlus.sol b/src/test/utils/DSTestPlus.sol index 8a677394..195df3f2 100644 --- a/src/test/utils/DSTestPlus.sol +++ b/src/test/utils/DSTestPlus.sol @@ -149,7 +149,7 @@ contract DSTestPlus is DSTest { uint256 x, uint256 min, uint256 max - ) internal virtual returns (uint256 result) { + ) public virtual returns (uint256 result) { require(max >= min, "MAX_LESS_THAN_MIN"); uint256 size = max - min; From 7ab5c8096c8d7e05162bc48e7a2df34acd1f170b Mon Sep 17 00:00:00 2001 From: Veliko Minkov <2662912+vminkov@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:44:08 +0300 Subject: [PATCH 4/8] bound() should be internal instead of public --- src/test/utils/DSTestPlus.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/utils/DSTestPlus.sol b/src/test/utils/DSTestPlus.sol index 195df3f2..8a677394 100644 --- a/src/test/utils/DSTestPlus.sol +++ b/src/test/utils/DSTestPlus.sol @@ -149,7 +149,7 @@ contract DSTestPlus is DSTest { uint256 x, uint256 min, uint256 max - ) public virtual returns (uint256 result) { + ) internal virtual returns (uint256 result) { require(max >= min, "MAX_LESS_THAN_MIN"); uint256 size = max - min; From 315b0f63b28f2b367d28b872997819d68f8f1a48 Mon Sep 17 00:00:00 2001 From: t11s Date: Tue, 5 Jul 2022 10:11:59 -0700 Subject: [PATCH 5/8] Restore .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b16dd73..fa9a4b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /cache /node_modules /out -solmate.iml From 0a59c9c79661920049aa362d290953b61e746da3 Mon Sep 17 00:00:00 2001 From: t11s Date: Tue, 5 Jul 2022 10:12:21 -0700 Subject: [PATCH 6/8] Update .gitignore From 2541ad313ab27c0d3aded3ffc62c870f2ac96666 Mon Sep 17 00:00:00 2001 From: t11s Date: Tue, 5 Jul 2022 10:12:45 -0700 Subject: [PATCH 7/8] Update .gitignore From 9a57423601c1398dc3ba14d4590c9e3725b8e7c0 Mon Sep 17 00:00:00 2001 From: t11s Date: Tue, 5 Jul 2022 10:13:18 -0700 Subject: [PATCH 8/8] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fa9a4b1c..5dfe93fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /cache /node_modules -/out +/out \ No newline at end of file