inherit IThirdweb... in implementation, not interface

thirdweb-dev · Apr 18, 2022 · 5ecef13 · 5ecef13
1 parent 1e93e60
commit 5ecef13
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/contracts/interfaces/IMultiwrap.sol b/contracts/interfaces/IMultiwrap.sol
@@ -1,18 +1,14 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.11;
 
-import "./IThirdwebContract.sol";
-import "./IThirdwebRoyalty.sol";
-import "./IThirdwebOwnable.sol";
-
 /**
  *  Thirdweb's Multiwrap contract lets you wrap arbitrary ERC20, ERC721 and ERC1155
  *  tokens you own into a single wrapped token / NFT.
  *
  *  A wrapped NFT can be unwrapped i.e. burned in exchange for its underlying contents.
  */
 
-interface IMultiwrap is IThirdwebContract, IThirdwebOwnable, IThirdwebRoyalty {
+interface IMultiwrap {
     /// @notice The type of assets that can be wrapped.
     enum TokenType {
         ERC20,

diff --git a/contracts/multiwrap/Multiwrap.sol b/contracts/multiwrap/Multiwrap.sol
@@ -18,19 +18,26 @@ import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.
 
 //  ==========  Internal imports    ==========
 
+import "../interfaces/IThirdwebContract.sol";
+import "../interfaces/IThirdwebRoyalty.sol";
+import "../interfaces/IThirdwebOwnable.sol";
+
 import "../interfaces/IMultiwrap.sol";
 import "../lib/CurrencyTransferLib.sol";
 import "../openzeppelin-presets/metatx/ERC2771ContextUpgradeable.sol";
 
 contract Multiwrap is
-    IMultiwrap,
+    IThirdwebContract,
+    IThirdwebOwnable,
+    IThirdwebRoyalty,
     ReentrancyGuardUpgradeable,
     ERC2771ContextUpgradeable,
     MulticallUpgradeable,
     AccessControlEnumerableUpgradeable,
     ERC1155HolderUpgradeable,
     ERC721HolderUpgradeable,
-    ERC721Upgradeable
+    ERC721Upgradeable,
+    IMultiwrap
 {
     /*///////////////////////////////////////////////////////////////
                             State variables

diff --git a/lib/ds-test b/lib/ds-test
diff --git a/lib/forge-std b/lib/forge-std