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

getApproved require the given token ID exist (#1256)

Browse Source 
* getApproved require the given token ID exist

* missing commit from merge

* clarify the test descriptions
This commit is contained in:
Bing Yi
2018-09-07 06:43:48 +08:00
committed by Nicolás Venturo
parent 661e5d86dc
commit a7ee54e199
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/token/ERC721/ERC721Basic.sol
View File

@ -93,10 +93,12 @@ contract ERC721Basic is ERC165, IERC721Basic {
/** /**
* @dev Gets the approved address for a token ID, or zero if no address set * @dev Gets the approved address for a token ID, or zero if no address set
* Reverts if the token ID does not exist.
* @param _tokenId uint256 ID of the token to query the approval of * @param _tokenId uint256 ID of the token to query the approval of
* @return address currently approved for the given token ID * @return address currently approved for the given token ID
*/ */
function getApproved(uint256 _tokenId) public view returns (address) { function getApproved(uint256 _tokenId) public view returns (address) {
require(_exists(_tokenId));
return tokenApprovals_[_tokenId]; return tokenApprovals_[_tokenId];
} }

8
test/token/ERC721/ERC721MintBurn.behavior.js
View File

@ -84,15 +84,17 @@ function shouldBehaveLikeMintAndBurnERC721 (accounts) {
}); });
}); });
describe('when there is a previous approval', function () { describe('when there is a previous approval burned', function () {
beforeEach(async function () { beforeEach(async function () {
await this.token.approve(accounts[1], tokenId, { from: sender }); await this.token.approve(accounts[1], tokenId, { from: sender });
const result = await this.token.burn(tokenId, { from: sender }); const result = await this.token.burn(tokenId, { from: sender });
logs = result.logs; logs = result.logs;
}); });
it('clears the approval', async function () { context('getApproved', function () {
(await this.token.getApproved(tokenId)).should.be.equal(ZERO_ADDRESS); it('reverts', async function () {
await assertRevert(this.token.getApproved(tokenId));
});
}); });
}); });