Skip to content

Added wrappers for assertErrorsAllowed functions #22

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 1 commit into from
Apr 18, 2024
Merged

Added wrappers for assertErrorsAllowed functions #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions src/AssertHelper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
}
34 changes: 6 additions & 28 deletions src/AssertWrapper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}