Change zero address revert message in the balanceOf function of ERC721 and ERC1155 (#3314)

pull/3320/head
Amin Bashiri 3 years ago committed by GitHub
parent 69c3781043
commit 742e85be7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      contracts/token/ERC1155/ERC1155.sol
  2. 2
      contracts/token/ERC721/ERC721.sol
  3. 4
      test/token/ERC1155/ERC1155.behavior.js
  4. 2
      test/token/ERC721/ERC721.behavior.js

@ -68,7 +68,7 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI {
* - `account` cannot be the zero address. * - `account` cannot be the zero address.
*/ */
function balanceOf(address account, uint256 id) public view virtual override returns (uint256) { function balanceOf(address account, uint256 id) public view virtual override returns (uint256) {
require(account != address(0), "ERC1155: balance query for the zero address"); require(account != address(0), "ERC1155: address zero is not a valid owner");
return _balances[id][account]; return _balances[id][account];
} }

@ -60,7 +60,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
* @dev See {IERC721-balanceOf}. * @dev See {IERC721-balanceOf}.
*/ */
function balanceOf(address owner) public view virtual override returns (uint256) { function balanceOf(address owner) public view virtual override returns (uint256) {
require(owner != address(0), "ERC721: balance query for the zero address"); require(owner != address(0), "ERC721: address zero is not a valid owner");
return _balances[owner]; return _balances[owner];
} }

@ -23,7 +23,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
it('reverts when queried about the zero address', async function () { it('reverts when queried about the zero address', async function () {
await expectRevert( await expectRevert(
this.token.balanceOf(ZERO_ADDRESS, firstTokenId), this.token.balanceOf(ZERO_ADDRESS, firstTokenId),
'ERC1155: balance query for the zero address', 'ERC1155: address zero is not a valid owner',
); );
}); });
@ -106,7 +106,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
[firstTokenHolder, secondTokenHolder, ZERO_ADDRESS], [firstTokenHolder, secondTokenHolder, ZERO_ADDRESS],
[firstTokenId, secondTokenId, unknownTokenId], [firstTokenId, secondTokenId, unknownTokenId],
), ),
'ERC1155: balance query for the zero address', 'ERC1155: address zero is not a valid owner',
); );
}); });

@ -46,7 +46,7 @@ function shouldBehaveLikeERC721 (errorPrefix, owner, newOwner, approved, another
context('when querying the zero address', function () { context('when querying the zero address', function () {
it('throws', async function () { it('throws', async function () {
await expectRevert( await expectRevert(
this.token.balanceOf(ZERO_ADDRESS), 'ERC721: balance query for the zero address', this.token.balanceOf(ZERO_ADDRESS), 'ERC721: address zero is not a valid owner',
); );
}); });
}); });

Loading…
Cancel
Save