Skip to content

Fix logic for assertErrorsAllowed #24

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 3 commits into from
Apr 18, 2024
Merged

Fix logic for assertErrorsAllowed #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3d4a34
Update AssertHelper.sol
ljz3 Apr 18, 2024
8bddd13
Update AssertHelper.sol
ljz3 Apr 18, 2024
05a911a
Update AssertHelper.sol
ljz3 Apr 18, 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
26 changes: 14 additions & 12 deletions src/AssertHelper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,33 +376,35 @@ 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 messages
) internal {
bool allowed = false;
uint256 errorIndex = 0;
uint256 passIndex = 0;
for (uint256 i = 0; i < allowedErrors.length; i++) {
if (errorSelector == allowedErrors[i]) {
allowed = true;
} else {
allowed = false;
}
if (!allowed) {
errorIndex = i;
passIndex = i;
break;
}
}
assertWithMsg(allowed, message[errorIndex]);
assertWithMsg(allowed, messages[passIndex]);
}
}