Skip to content

O
openzeppelin-contracts-upgradeable
Commit af337047 by Facundo Spagnuolo
Options

Fix solint errors

parent 5b50e99a
Showing with 8 additions and 7 deletions
contracts/mocks/ERC721TokenMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/ERC721Token.sol'; import "../token/ERC721Token.sol";
/** /**
* @title ERC721TokenMock * @title ERC721TokenMock
......
contracts/token/ERC721Token.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './ERC721.sol'; import "./ERC721.sol";
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
/** /**
* @title ERC721Token * @title ERC721Token
...@@ -97,9 +97,10 @@ contract ERC721Token is ERC721 { ...@@ -97,9 +97,10 @@ contract ERC721Token is ERC721 {
function approve(address _to, uint256 _tokenId) public onlyOwnerOf(_tokenId) { function approve(address _to, uint256 _tokenId) public onlyOwnerOf(_tokenId) {
address owner = ownerOf(_tokenId); address owner = ownerOf(_tokenId);
require(_to != owner); require(_to != owner);
if(approvedFor(_tokenId) == 0 && _to == 0) return; if (approvedFor(_tokenId) != 0 || _to != 0) {
tokenApprovals[_tokenId] = _to; tokenApprovals[_tokenId] = _to;
Approval(owner, _to, _tokenId); Approval(owner, _to, _tokenId);
}
} }
/** /**
...@@ -127,7 +128,7 @@ contract ERC721Token is ERC721 { ...@@ -127,7 +128,7 @@ contract ERC721Token is ERC721 {
* @param _tokenId uint256 ID of the token being burned by the msg.sender * @param _tokenId uint256 ID of the token being burned by the msg.sender
*/ */
function burn(uint256 _tokenId) onlyOwnerOf(_tokenId) internal { function burn(uint256 _tokenId) onlyOwnerOf(_tokenId) internal {
if(approvedFor(_tokenId) != 0) { if (approvedFor(_tokenId) != 0) {
clearApproval(msg.sender, _tokenId); clearApproval(msg.sender, _tokenId);
} }
removeToken(msg.sender, _tokenId); removeToken(msg.sender, _tokenId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment