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

Use if-statements instead of boolean one-liners for clarity

Browse Source 
:-(
This commit is contained in:
Santiago Palladino
2018-03-21 11:42:47 -03:00
parent 6b98e4e080
commit 3f2ea8a329
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/token/ERC721/ERC721BasicToken.sol
View File

@ -223,7 +223,9 @@ contract ERC721BasicToken is ERC721Basic {
removeToken(_from, _tokenId);
addToken(_to, _tokenId);
require(!_safe || checkAndCallSafeTransfer(_from, _to, _tokenId, _data));
if (_safe) {
require(checkAndCallSafeTransfer(_from, _to, _tokenId, _data));
}
Transfer(_from, _to, _tokenId);
}
@ -274,7 +276,10 @@ contract ERC721BasicToken is ERC721Basic {
* @return whether the call correctly returned the expected magic value
*/
function checkAndCallSafeTransfer(address _from, address _to, uint256 _tokenId, bytes _data) internal returns (bool) {
return !_to.isContract() ||
(ERC721Receiver(_to).onERC721Received(_from, _tokenId, _data) == ERC721_RECEIVED);
if (!_to.isContract()) {
return true;
}
bytes4 retval = ERC721Receiver(_to).onERC721Received(_from, _tokenId, _data);
return (retval == ERC721_RECEIVED);
}
}