Explicit overrides for RWR (#305)

mliu · PlayJok3r · web-flow · commit 026cbf04b739 · 2023-05-11T15:36:27.000-07:00
Explicit overrides

Co-authored-by: PlayJok3r &lt;jpeng.ustc@gmail.com&gt;
diff --git a/contracts/receivables/RealWorldReceivable.sol b/contracts/receivables/RealWorldReceivable.sol
@@ -176,14 +176,14 @@ contract RealWorldReceivable is
         uint256 tokenId,
         uint256 batchSize
     ) internal override(ERC721Upgradeable, ERC721EnumerableUpgradeable) {
-        super._beforeTokenTransfer(from, to, tokenId, batchSize);
+        ERC721EnumerableUpgradeable._beforeTokenTransfer(from, to, tokenId, batchSize);
     }
 
     function _burn(uint256 tokenId)
         internal
         override(ERC721Upgradeable, ERC721URIStorageUpgradeable)
     {
-        super._burn(tokenId);
+        ERC721URIStorageUpgradeable._burn(tokenId);
     }
 
     function tokenURI(uint256 tokenId)
@@ -192,7 +192,7 @@ contract RealWorldReceivable is
         override(ERC721Upgradeable, ERC721URIStorageUpgradeable)
         returns (string memory)
     {
-        return super.tokenURI(tokenId);
+        return ERC721URIStorageUpgradeable.tokenURI(tokenId);
     }
 
     function supportsInterface(bytes4 interfaceId)

Original file line number	Diff line number	Diff line change
`@@ -176,14 +176,14 @@ contract RealWorldReceivable is`
`176`	`176`	`uint256 tokenId,`
`177`	`177`	`uint256 batchSize`
`178`	`178`	`) internal override(ERC721Upgradeable, ERC721EnumerableUpgradeable) {`
`179`		`- super._beforeTokenTransfer(from, to, tokenId, batchSize);`
	`179`	`+ ERC721EnumerableUpgradeable._beforeTokenTransfer(from, to, tokenId, batchSize);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`function _burn(uint256 tokenId)`
`183`	`183`	`internal`
`184`	`184`	`override(ERC721Upgradeable, ERC721URIStorageUpgradeable)`
`185`	`185`	`{`
`186`		`- super._burn(tokenId);`
	`186`	`+ ERC721URIStorageUpgradeable._burn(tokenId);`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`function tokenURI(uint256 tokenId)`
`@@ -192,7 +192,7 @@ contract RealWorldReceivable is`
`192`	`192`	`override(ERC721Upgradeable, ERC721URIStorageUpgradeable)`
`193`	`193`	`returns (string memory)`
`194`	`194`	`{`
`195`		`- return super.tokenURI(tokenId);`
	`195`	`+ return ERC721URIStorageUpgradeable.tokenURI(tokenId);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`function supportsInterface(bytes4 interfaceId)`