NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve tests for ERC1155 and ERC721 error handling (#3781)

Browse Source 
Co-authored-by: Francisco <fg@frang.io>
This commit is contained in:
Hadrien Croubois
2023-06-20 05:20:02 +02:00
committed by GitHub
parent 1d0dbcf9ab
commit 365aca6d60
4 changed files with 237 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
contracts/mocks/token/ERC1155ReceiverMock.sol
View File

@ -8,26 +8,24 @@ import "../../utils/introspection/ERC165.sol";
contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
enum RevertType {
None,
Empty,
String,
Custom
RevertWithoutMessage,
RevertWithMessage,
RevertWithCustomError,
Panic
}
bytes4 private _recRetval;
RevertType private _recReverts;
bytes4 private _batRetval;
RevertType private _batReverts;
bytes4 private immutable _recRetval;
bytes4 private immutable _batRetval;
RevertType private immutable _error;
event Received(address operator, address from, uint256 id, uint256 value, bytes data, uint256 gas);
event BatchReceived(address operator, address from, uint256[] ids, uint256[] values, bytes data, uint256 gas);
error CustomError(bytes4);
error ERC1155ReceiverMockError();
constructor(bytes4 recRetval, RevertType recReverts, bytes4 batRetval, RevertType batReverts) {
constructor(bytes4 recRetval, bytes4 batRetval, RevertType error) {
_recRetval = recRetval;
_recReverts = recReverts;
_batRetval = batRetval;
_batReverts = batReverts;
_error = error;
}
function onERC1155Received(
@ -37,12 +35,15 @@ contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
uint256 value,
bytes calldata data
) external returns (bytes4) {
if (_recReverts == RevertType.Empty) {
if (_error == RevertType.RevertWithoutMessage) {
revert();
} else if (_recReverts == RevertType.String) {
} else if (_error == RevertType.RevertWithMessage) {
revert("ERC1155ReceiverMock: reverting on receive");
} else if (_recReverts == RevertType.Custom) {
revert ERC1155ReceiverMockError();
} else if (_error == RevertType.RevertWithCustomError) {
revert CustomError(_recRetval);
} else if (_error == RevertType.Panic) {
uint256 a = uint256(0) / uint256(0);
a;
}
emit Received(operator, from, id, value, data, gasleft());
@ -56,12 +57,15 @@ contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
uint256[] calldata values,
bytes calldata data
) external returns (bytes4) {
if (_batReverts == RevertType.Empty) {
if (_error == RevertType.RevertWithoutMessage) {
revert();
} else if (_batReverts == RevertType.String) {
} else if (_error == RevertType.RevertWithMessage) {
revert("ERC1155ReceiverMock: reverting on batch receive");
} else if (_batReverts == RevertType.Custom) {
revert ERC1155ReceiverMockError();
} else if (_error == RevertType.RevertWithCustomError) {
revert CustomError(_recRetval);
} else if (_error == RevertType.Panic) {
uint256 a = uint256(0) / uint256(0);
a;
}
emit BatchReceived(operator, from, ids, values, data, gasleft());

21
contracts/mocks/token/ERC721ReceiverMock.sol
View File

@ -5,19 +5,21 @@ pragma solidity ^0.8.19;
import "../../token/ERC721/IERC721Receiver.sol";
contract ERC721ReceiverMock is IERC721Receiver {
enum Error {
enum RevertType {
None,
RevertWithMessage,
RevertWithoutMessage,
RevertWithMessage,
RevertWithCustomError,
Panic
}
bytes4 private immutable _retval;
Error private immutable _error;
RevertType private immutable _error;
event Received(address operator, address from, uint256 tokenId, bytes data, uint256 gas);
error CustomError(bytes4);
constructor(bytes4 retval, Error error) {
constructor(bytes4 retval, RevertType error) {
_retval = retval;
_error = error;
}
@ -28,14 +30,17 @@ contract ERC721ReceiverMock is IERC721Receiver {
uint256 tokenId,
bytes memory data
) public returns (bytes4) {
if (_error == Error.RevertWithMessage) {
revert("ERC721ReceiverMock: reverting");
} else if (_error == Error.RevertWithoutMessage) {
if (_error == RevertType.RevertWithoutMessage) {
revert();
} else if (_error == Error.Panic) {
} else if (_error == RevertType.RevertWithMessage) {
revert("ERC721ReceiverMock: reverting");
} else if (_error == RevertType.RevertWithCustomError) {
revert CustomError(_retval);
} else if (_error == RevertType.Panic) {
uint256 a = uint256(0) / uint256(0);
a;
}
emit Received(operator, from, tokenId, data, gasleft());
return _retval;
}