diff --git a/src/helpers/HelperAssert.sol b/src/helpers/HelperAssert.sol index 34638e7..0541963 100644 --- a/src/helpers/HelperAssert.sol +++ b/src/helpers/HelperAssert.sol @@ -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(); } @@ -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(); } } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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(); } @@ -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)); + } + }