fixes OpenZeppelin#1512

Aniket-Engg · Nov 28, 2018 · ac8c493 · ac8c493
1 parent 7f9725e
commit ac8c493
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/contracts/mocks/ERC721FullMock.sol b/contracts/mocks/ERC721FullMock.sol
@@ -7,8 +7,8 @@ import "../token/ERC721/ERC721Burnable.sol";
 
 /**
  * @title ERC721FullMock
- * This mock just provides a public mint and burn functions for testing purposes,
- * and a public setter for metadata URI
+ * This mock just provides public functions for setting metadata URI, getting all tokens of an owner,
+ * checking token existence, removal of a token from an address 
  */
 contract ERC721FullMock is ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
     constructor (string name, string symbol) public ERC721Mintable() ERC721Full(name, symbol) {}
@@ -17,6 +17,10 @@ contract ERC721FullMock is ERC721Full, ERC721Mintable, ERC721MetadataMintable, E
         return _exists(tokenId);
     }
 
+    function tokensOfOwner(address owner) public view returns (uint256[] memory) {
+        return _tokensOfOwner(owner);
+    }
+
     function setTokenURI(uint256 tokenId, string uri) public {
         _setTokenURI(tokenId, uri);
     }

diff --git a/contracts/token/ERC721/ERC721Enumerable.sol b/contracts/token/ERC721/ERC721Enumerable.sol
@@ -144,4 +144,13 @@ contract ERC721Enumerable is ERC165, ERC721, IERC721Enumerable {
         _allTokensIndex[tokenId] = 0;
         _allTokensIndex[lastToken] = tokenIndex;
     }
+
+    /**
+     * @dev Gets the list of token IDs of the requested owner
+     * @param owner address owning the tokens 
+     * @return uint256[] List of token IDs owned by the requested address
+     */
+    function _tokensOfOwner(address owner) internal view returns (uint256[] storage) {
+        return _ownedTokens[owner];
+    }
 }
diff --git a/test/token/ERC721/ERC721Full.test.js b/test/token/ERC721/ERC721Full.test.js
@@ -138,6 +138,14 @@ contract('ERC721Full', function ([
       });
     });
 
+    describe('tokensOfOwner', function () {
+      it('returns total tokens of owner', async function () {
+        const tokenIds = await this.token.tokensOfOwner(owner);
+        tokenIds[0].should.be.bignumber.equal(firstTokenId);
+        tokenIds[1].should.be.bignumber.equal(secondTokenId);
+      });
+    });
+
     describe('totalSupply', function () {
       it('returns total token supply', async function () {
         (await this.token.totalSupply()).should.be.bignumber.equal(2);