From 72bbecb45f5ed4937e40e3c81faa98c6e2cb5073 Mon Sep 17 00:00:00 2001 From: Rappie Date: Mon, 25 Mar 2024 11:59:18 +0100 Subject: [PATCH] Use `abi.encodePacked` instead of `string.concat` --- src/AssertHelper.sol | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/AssertHelper.sol b/src/AssertHelper.sol index 4928fa3..c0be437 100644 --- a/src/AssertHelper.sol +++ b/src/AssertHelper.sol @@ -331,7 +331,10 @@ abstract contract AssertHelper { ) internal { bool isEqual = FuzzLibString.isRevertReasonEqual(returnData, reason1) || FuzzLibString.isRevertReasonEqual(returnData, reason2); - assertWithMsg(isEqual, string.concat(reason1, " OR ", reason2)); + string memory assertMsg = string( + abi.encodePacked(reason1, " OR ", reason2) + ); + assertWithMsg(isEqual, assertMsg); } function assertRevertReasonEqual( @@ -343,7 +346,10 @@ abstract contract AssertHelper { bool isEqual = FuzzLibString.isRevertReasonEqual(returnData, reason1) || FuzzLibString.isRevertReasonEqual(returnData, reason2) || FuzzLibString.isRevertReasonEqual(returnData, reason3); - assertWithMsg(isEqual, string.concat(reason1, " OR ", reason2, " OR ", reason3)); + string memory assertMsg = string( + abi.encodePacked(reason1, " OR ", reason2, " OR ", reason3) + ); + assertWithMsg(isEqual, assertMsg); } function assertRevertReasonEqual( @@ -357,9 +363,8 @@ abstract contract AssertHelper { FuzzLibString.isRevertReasonEqual(returnData, reason2) || FuzzLibString.isRevertReasonEqual(returnData, reason3) || FuzzLibString.isRevertReasonEqual(returnData, reason4); - assertWithMsg( - isEqual, - string.concat( + string memory assertMsg = string( + abi.encodePacked( reason1, " OR ", reason2,