From c3d4a3467dd5604582adad8ce9ea0306f40557c9 Mon Sep 17 00:00:00 2001 From: ljz3 Date: Thu, 18 Apr 2024 17:43:22 +0400 Subject: [PATCH 1/3] Update AssertHelper.sol --- src/AssertHelper.sol | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/AssertHelper.sol b/src/AssertHelper.sol index 834e7a4..0d5d02f 100644 --- a/src/AssertHelper.sol +++ b/src/AssertHelper.sol @@ -376,29 +376,31 @@ abstract contract AssertHelper { ); } - function assertErrorsAllowed(bytes4 errorSelector, bytes4[] memory allowedErrors, string memory message) internal { + function assertErrorsAllowed( + bytes4 errorSelector, + bytes4[] memory allowedErrors, + string memory message + ) internal { bool allowed = false; for (uint256 i = 0; i < allowedErrors.length; i++) { if (errorSelector == allowedErrors[i]) { allowed = true; - } else { - allowed = false; + break; } - if (!allowed) break; } assertWithMsg(allowed, message); } - function assertErrorsAllowedMultiMsg(bytes4 errorSelector, bytes4[] memory allowedErrors, string[] memory message) internal { + function assertErrorsAllowedMultiMsg( + bytes4 errorSelector, + bytes4[] memory allowedErrors, + string[] memory message + ) internal { bool allowed = false; uint256 errorIndex = 0; for (uint256 i = 0; i < allowedErrors.length; i++) { if (errorSelector == allowedErrors[i]) { allowed = true; - } else { - allowed = false; - } - if (!allowed) { errorIndex = i; break; } From 8bddd130873cceaf9ee3af6cfa20d9422ff47879 Mon Sep 17 00:00:00 2001 From: ljz3 Date: Thu, 18 Apr 2024 18:02:56 +0400 Subject: [PATCH 2/3] Update AssertHelper.sol --- src/AssertHelper.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AssertHelper.sol b/src/AssertHelper.sol index 0d5d02f..25ab360 100644 --- a/src/AssertHelper.sol +++ b/src/AssertHelper.sol @@ -397,14 +397,14 @@ abstract contract AssertHelper { string[] memory message ) internal { bool allowed = false; - uint256 errorIndex = 0; + uint256 passIndex = 0; for (uint256 i = 0; i < allowedErrors.length; i++) { if (errorSelector == allowedErrors[i]) { allowed = true; - errorIndex = i; + passIndex = i; break; } } - assertWithMsg(allowed, message[errorIndex]); + assertWithMsg(allowed, message[passIndex]); } } From 05a911a2d81bec72870d65234e058bbebb6c5122 Mon Sep 17 00:00:00 2001 From: ljz3 Date: Thu, 18 Apr 2024 18:03:16 +0400 Subject: [PATCH 3/3] Update AssertHelper.sol --- src/AssertHelper.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AssertHelper.sol b/src/AssertHelper.sol index 25ab360..5f74259 100644 --- a/src/AssertHelper.sol +++ b/src/AssertHelper.sol @@ -394,7 +394,7 @@ abstract contract AssertHelper { function assertErrorsAllowedMultiMsg( bytes4 errorSelector, bytes4[] memory allowedErrors, - string[] memory message + string[] memory messages ) internal { bool allowed = false; uint256 passIndex = 0; @@ -405,6 +405,6 @@ abstract contract AssertHelper { break; } } - assertWithMsg(allowed, message[passIndex]); + assertWithMsg(allowed, messages[passIndex]); } }