Skip to content

optimization of assertmsg sender #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2024
Merged

optimization of assertmsg sender #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a9c1c
optimization of assertmsg sender
Jun 13, 2024
894b3e7
small changes
Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 18 additions & 97 deletions src/helpers/HelperAssert.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,7 @@ abstract contract HelperAssert is HelperBase {
if (a != b) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"!=",
bStr,
", reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "!=", reason);
emit AssertEqFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -53,15 +46,8 @@ abstract contract HelperAssert is HelperBase {
if (a != b) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"!=",
bStr,
", reason: ",
reason
);
emit AssertEqFail(string(assertMsg));
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "!=", reason);
emit AssertEqFail(string(assertMsg));
platform.assertFail();
}
}
Expand All @@ -75,14 +61,7 @@ abstract contract HelperAssert is HelperBase {
if (a != b) {
string memory aStr = a ? "true" : "false";
string memory bStr = b ? "true" : "false";
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"!=",
bStr,
", reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "!=", reason);
emit AssertEqFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -97,14 +76,7 @@ abstract contract HelperAssert is HelperBase {
if (a != b) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"!=",
bStr,
", reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "!=", reason);
emit AssertEqFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -121,14 +93,7 @@ abstract contract HelperAssert is HelperBase {
bytes memory bBytes = abi.encodePacked(b);
string memory aStr = FuzzLibString.toHexString(aBytes);
string memory bStr = FuzzLibString.toHexString(bBytes);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"!=",
bStr,
", reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "!=", reason);
emit AssertEqFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -143,14 +108,7 @@ abstract contract HelperAssert is HelperBase {
if (a == b) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"==",
bStr,
", reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "==", reason);
emit AssertNeqFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -165,14 +123,7 @@ abstract contract HelperAssert is HelperBase {
if (a == b) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"==",
bStr,
", reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "==", reason);
emit AssertNeqFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -187,14 +138,7 @@ abstract contract HelperAssert is HelperBase {
if (!(a >= b)) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"<",
bStr,
" failed, reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "<", reason);
emit AssertGteFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -209,14 +153,7 @@ abstract contract HelperAssert is HelperBase {
if (!(a >= b)) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"<",
bStr,
" failed, reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "<", reason);
emit AssertGteFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -231,14 +168,7 @@ abstract contract HelperAssert is HelperBase {
if (!(a > b)) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
"<=",
bStr,
" failed, reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, "<=", reason);
emit AssertGtFail(string(assertMsg));
platform.assertFail();
}
Expand Down Expand Up @@ -319,14 +249,7 @@ abstract contract HelperAssert is HelperBase {
if (!(a < b)) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
">=",
bStr,
" failed, reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, ">=", reason);
emit AssertLtFail(string(assertMsg));
platform.assertFail();
}
Expand All @@ -341,14 +264,7 @@ abstract contract HelperAssert is HelperBase {
if (!(a < b)) {
string memory aStr = FuzzLibString.toString(a);
string memory bStr = FuzzLibString.toString(b);
bytes memory assertMsg = abi.encodePacked(
"Invalid: ",
aStr,
">=",
bStr,
" failed, reason: ",
reason
);
bytes memory assertMsg = createAssertFailMessage(aStr, bStr, ">=", reason);
emit AssertLtFail(string(assertMsg));
platform.assertFail();
}
Expand Down Expand Up @@ -454,4 +370,9 @@ abstract contract HelperAssert is HelperBase {
}
t(allowed, messages[passIndex]);
}

function createAssertFailMessage(string memory aStr, string memory bStr, string memory operator, string memory reason)internal pure returns (bytes memory) {
return bytes(abi.encodePacked("Invalid: ", aStr, operator, bStr, ", reason: ", reason));
}

}