diff --git a/src/AssertHelper.sol b/src/AssertHelper.sol index c0be437..834e7a4 100644 --- a/src/AssertHelper.sol +++ b/src/AssertHelper.sol @@ -375,4 +375,34 @@ abstract contract AssertHelper { ) ); } + + 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; + } + if (!allowed) break; + } + assertWithMsg(allowed, message); + } + + 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; + } + } + assertWithMsg(allowed, message[errorIndex]); + } } diff --git a/src/AssertWrapper.sol b/src/AssertWrapper.sol index 23711b9..87b8766 100644 --- a/src/AssertWrapper.sol +++ b/src/AssertWrapper.sol @@ -60,33 +60,11 @@ abstract contract AssertWrapper is AssertHelper { assertWithMsg(a, message); } - function assertErrorsAllowed(bytes4 errorSelector, bytes4[] memory allowedErrors, string memory message) private { - bool allowed = false; - for (uint256 i = 0; i < allowedErrors.length; i++) { - if (errorSelector == allowedErrors[i]) { - allowed = true; - } else { - allowed = false; - } - if (!allowed) break; - } - t(allowed, message); - } - - function assertErrorsAllowedMultiMsg(bytes4 errorSelector, bytes4[] memory allowedErrors, string[] memory message) private { - 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; - } - } - t(allowed, message[errorIndex]); + function errAllow(bytes4 errorSelector, bytes4[] memory allowedErrors, string memory message) internal { + assertErrorsAllowed(errorSelector, allowedErrors, message); + } + + function errsAllow(bytes4 errorSelector, bytes4[] memory allowedErrors, string[] memory message) internal { + assertErrorsAllowedMultiMsg(errorSelector, allowedErrors, message); } }