Merge pull request #1 from ronin-chain/feature/remove-redundant-inher…

…itance feat: IREP15 shouldn't inherit IERC721
ronin-chain · Jul 1, 2024 · 7a683dd · 7a683dd
2 parents 3b07bb0 + e99ded0
commit 7a683dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/REP15.sol b/src/REP15.sol
@@ -180,7 +180,7 @@ abstract contract REP15 is ERC721, IREP15, IREP15Errors {
   /**
    * @dev Overrides {ERC721-transferFrom} with additional checks for REP15.
    */
-  function transferFrom(address from, address to, uint256 tokenId) public virtual override(ERC721, IERC721) {
+  function transferFrom(address from, address to, uint256 tokenId) public virtual override {
     _beforeTokenTransfer(tokenId, "");
 
     _transfer(from, to, tokenId);
@@ -189,11 +189,7 @@ abstract contract REP15 is ERC721, IREP15, IREP15Errors {
   /**
    * @dev Overrides {ERC721-safeTransferFrom} with additional checks for REP15.
    */
-  function safeTransferFrom(address from, address to, uint256 tokenId, bytes memory data)
-    public
-    virtual
-    override(ERC721, IERC721)
-  {
+  function safeTransferFrom(address from, address to, uint256 tokenId, bytes memory data) public virtual override {
     _beforeTokenTransfer(tokenId, data);
 
     _safeTransfer(from, to, tokenId, data);

diff --git a/src/interfaces/IREP15.sol b/src/interfaces/IREP15.sol
@@ -2,10 +2,9 @@
 pragma solidity ^0.8.26;
 
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 /// Note: the ERC-165 identifier for this interface is 0xba63ebbb.
-interface IREP15 is IERC165, IERC721 {
+interface IREP15 is IERC165 {
   /// @dev This emits when a context is updated by any mechanism.
   event ContextUpdated(bytes32 indexed ctxHash, address indexed controller, uint64 detachingDuration);
   /// @dev This emits when a context is deprecated by any mechanism.