From 6387b2f9eacc2ab0c62ce53fc55aae9853e7acbd Mon Sep 17 00:00:00 2001 From: ljz3 Date: Tue, 16 Jan 2024 00:08:37 -0500 Subject: [PATCH 1/3] Create AssertWrapper.sol --- src/AssertWrapper.sol | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/AssertWrapper.sol diff --git a/src/AssertWrapper.sol b/src/AssertWrapper.sol new file mode 100644 index 0000000..798b18b --- /dev/null +++ b/src/AssertWrapper.sol @@ -0,0 +1,33 @@ +pragma solidity ^0.8.20; + +import './AssertHelper.sol'; + +abstract contract EchidnaAsserts is AssertHelper { + function gt(uint256 a, uint256 b, string memory message) internal { + assertGt(a, b, message); + } + + function lt(uint256 a, uint256 b, string memory message) internal { + assertLt(a, b, message); + } + + function gte(uint256 a, uint256 b, string memory message) internal { + assertGte(a, b, message); + } + + function lte(uint256 a, uint256 b, string memory message) internal { + assertLte(a, b, message); + } + + function eq(uint256 a, uint256 b, string memory message) internal { + assertEq(a, b, message); + } + + function neq(uint256 a, uint256 b, string memory message) internal { + assertNeq(a, b, message); + } + + function t(bool a, string memory message) internal { + assertWithMsg(a, message); + } +} From f9115d6d2c5bf02b2bd5d90415687d4a2f9366aa Mon Sep 17 00:00:00 2001 From: ljz3 Date: Tue, 16 Jan 2024 00:16:16 -0500 Subject: [PATCH 2/3] Added license, changed pragma, formatting --- src/AssertWrapper.sol | 47 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/AssertWrapper.sol b/src/AssertWrapper.sol index 798b18b..5d71319 100644 --- a/src/AssertWrapper.sol +++ b/src/AssertWrapper.sol @@ -1,33 +1,34 @@ -pragma solidity ^0.8.20; +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.0; -import './AssertHelper.sol'; +import "./AssertHelper.sol"; abstract contract EchidnaAsserts is AssertHelper { - function gt(uint256 a, uint256 b, string memory message) internal { - assertGt(a, b, message); - } + function gt(uint256 a, uint256 b, string memory message) internal { + assertGt(a, b, message); + } - function lt(uint256 a, uint256 b, string memory message) internal { - assertLt(a, b, message); - } + function lt(uint256 a, uint256 b, string memory message) internal { + assertLt(a, b, message); + } - function gte(uint256 a, uint256 b, string memory message) internal { - assertGte(a, b, message); - } + function gte(uint256 a, uint256 b, string memory message) internal { + assertGte(a, b, message); + } - function lte(uint256 a, uint256 b, string memory message) internal { - assertLte(a, b, message); - } + function lte(uint256 a, uint256 b, string memory message) internal { + assertLte(a, b, message); + } - function eq(uint256 a, uint256 b, string memory message) internal { - assertEq(a, b, message); - } + function eq(uint256 a, uint256 b, string memory message) internal { + assertEq(a, b, message); + } - function neq(uint256 a, uint256 b, string memory message) internal { - assertNeq(a, b, message); - } + function neq(uint256 a, uint256 b, string memory message) internal { + assertNeq(a, b, message); + } - function t(bool a, string memory message) internal { - assertWithMsg(a, message); - } + function t(bool a, string memory message) internal { + assertWithMsg(a, message); + } } From 29266aae0c58ed8b327e66fd9b187e4271d9057a Mon Sep 17 00:00:00 2001 From: ljz3 Date: Tue, 16 Jan 2024 00:22:27 -0500 Subject: [PATCH 3/3] Added AssertWrapper to FuzzBase --- src/AssertWrapper.sol | 2 +- src/FuzzBase.sol | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AssertWrapper.sol b/src/AssertWrapper.sol index 5d71319..ed247bd 100644 --- a/src/AssertWrapper.sol +++ b/src/AssertWrapper.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; import "./AssertHelper.sol"; -abstract contract EchidnaAsserts is AssertHelper { +abstract contract AssertWrapper is AssertHelper { function gt(uint256 a, uint256 b, string memory message) internal { assertGt(a, b, message); } diff --git a/src/FuzzBase.sol b/src/FuzzBase.sol index e9f62a0..3a14432 100644 --- a/src/FuzzBase.sol +++ b/src/FuzzBase.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; import "./Logging.sol"; import "./Constants.sol"; -import "./AssertHelper.sol"; +import "./AssertWrapper.sol"; import "./ClampHelper.sol"; -abstract contract FuzzBase is AssertHelper, ClampHelper, Logging, Constants {} +abstract contract FuzzBase is AssertWrapper, ClampHelper, Logging, Constants {}