fix: mock land contracts in marketplace

thesandboxgame · Sep 3, 2024 · 7d7ce31 · 7d7ce31 · github-actions · Sep 3, 2024
1 parent 9e4e17b
commit 7d7ce31
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 712 deletions.
diff --git a/packages/marketplace/contracts/mocks/land/ERC721BaseToken.sol b/packages/marketplace/contracts/mocks/land/ERC721BaseToken.sol
@@ -6,10 +6,9 @@ import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import {Context} from "@openzeppelin/contracts/utils/Context.sol";
-// import {IERC721Errors} from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol";
-import {IERC721MandatoryTokenReceiver} from "./IERC721MandatoryTokenReceiver.sol";
+import {IERC721MandatoryTokenReceiver} from "@sandbox-smart-contracts/land/contracts/interfaces/IERC721MandatoryTokenReceiver.sol";
 import {IErrors} from "./IErrors.sol";
-import {IERC721BatchOps} from "./IERC721BatchOps.sol";
+import {IERC721BatchOps} from "@sandbox-smart-contracts/land/contracts/interfaces/IERC721BatchOps.sol";
 import {WithSuperOperators} from "./WithSuperOperators.sol";
 
 /// @title ERC721BaseTokenCommon

diff --git a/packages/marketplace/contracts/mocks/land/IERC173.sol b/packages/marketplace/contracts/mocks/land/IERC173.sol
diff --git a/packages/marketplace/contracts/mocks/land/IERC721BatchOps.sol b/packages/marketplace/contracts/mocks/land/IERC721BatchOps.sol
diff --git a/packages/marketplace/contracts/mocks/land/IERC721MandatoryTokenReceiver.sol b/packages/marketplace/contracts/mocks/land/IERC721MandatoryTokenReceiver.sol
diff --git a/packages/marketplace/contracts/mocks/land/ILandMetadataRegistry.sol b/packages/marketplace/contracts/mocks/land/ILandMetadataRegistry.sol
diff --git a/packages/marketplace/contracts/mocks/land/ILandToken.sol b/packages/marketplace/contracts/mocks/land/ILandToken.sol
diff --git a/packages/marketplace/contracts/mocks/land/IOperatorFilterRegistry.sol b/packages/marketplace/contracts/mocks/land/IOperatorFilterRegistry.sol
diff --git a/packages/marketplace/contracts/mocks/land/IQuad.sol b/packages/marketplace/contracts/mocks/land/IQuad.sol
diff --git a/packages/marketplace/contracts/mocks/land/LandBase.sol b/packages/marketplace/contracts/mocks/land/LandBase.sol
@@ -6,17 +6,17 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
-import {IOperatorFilterRegistry} from "./IOperatorFilterRegistry.sol";
-import {IERC173} from "./IERC173.sol";
-import {ILandToken} from "./ILandToken.sol";
-import {IQuad} from "./IQuad.sol";
-import {ILandMetadataRegistry} from "./ILandMetadataRegistry.sol";
-import {IERC721BatchOps} from "./IERC721BatchOps.sol";
+import {IOperatorFilterRegistry} from "@sandbox-smart-contracts/land/contracts/interfaces/IOperatorFilterRegistry.sol";
+import {IERC173} from "@sandbox-smart-contracts/land/contracts/interfaces/IERC173.sol";
+import {ILandToken} from "@sandbox-smart-contracts/land/contracts/interfaces/ILandToken.sol";
+import {IQuad} from "@sandbox-smart-contracts/land/contracts/interfaces/IQuad.sol";
+import {ILandMetadataRegistry} from "@sandbox-smart-contracts/land/contracts/interfaces/ILandMetadataRegistry.sol";
+import {IERC721BatchOps} from "@sandbox-smart-contracts/land/contracts/interfaces/IERC721BatchOps.sol";
 import {WithAdmin} from "./WithAdmin.sol";
-import {OperatorFiltererUpgradeable} from "./OperatorFiltererUpgradeable.sol";
+import {OperatorFiltererUpgradeable} from "@sandbox-smart-contracts/land/contracts/common/OperatorFiltererUpgradeable.sol";
 import {WithMetadataRegistry} from "./WithMetadataRegistry.sol";
-import {WithRoyalties} from "./WithRoyalties.sol";
-import {WithOwner} from "./WithOwner.sol";
+import {WithRoyalties} from "@sandbox-smart-contracts/land/contracts/common/WithRoyalties.sol";
+import {WithOwner} from "@sandbox-smart-contracts/land/contracts/common/WithOwner.sol";
 import {LandBaseToken} from "./LandBaseToken.sol";
 
 /// @title Land Contract

diff --git a/packages/marketplace/contracts/mocks/land/LandBaseToken.sol b/packages/marketplace/contracts/mocks/land/LandBaseToken.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.23;
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {IErrors} from "./IErrors.sol";
-import {ILandToken} from "./ILandToken.sol";
+import {ILandToken} from "@sandbox-smart-contracts/land/contracts/interfaces/ILandToken.sol";
 import {ERC721BaseToken} from "./ERC721BaseToken.sol";
 
 /// @title LandBaseToken

diff --git a/packages/marketplace/contracts/mocks/land/LandMock.sol b/packages/marketplace/contracts/mocks/land/LandMock.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.23;
 
-import {IOperatorFilterRegistry} from "./IOperatorFilterRegistry.sol";
+import {IOperatorFilterRegistry} from "@sandbox-smart-contracts/land/contracts/interfaces/IOperatorFilterRegistry.sol";
 import {WithAdmin} from "./WithAdmin.sol";
 import {WithSuperOperators} from "./WithSuperOperators.sol";
-import {OperatorFiltererUpgradeable} from "./OperatorFiltererUpgradeable.sol";
+import {OperatorFiltererUpgradeable} from "@sandbox-smart-contracts/land/contracts/common/OperatorFiltererUpgradeable.sol";
 import {ERC721BaseToken} from "./ERC721BaseToken.sol";
 import {LandBaseToken} from "./LandBaseToken.sol";
 import {LandBase} from "./LandBase.sol";
-import {LandStorageMixin} from "./LandStorageMixin.sol";
+import {LandStorageMixin} from "@sandbox-smart-contracts/land/contracts/mainnet/LandStorageMixin.sol";
 
 /// @title Land Mock Contrac
 contract LandMock is LandStorageMixin, LandBase {
File	Stmts	Branches	Funcs	Lines	Uncovered Lines
packages/asset/contracts
Asset.sol	94.70%	89.58%	96.67%	98.15%	117, 208, 310, 310–311, 77
AssetCreate.sol	90.36%	80.39%	95.65%	97.58%	114, 188–189, 270–271, 316, 392–393, 426, 480–481, 488–489, 496–497, 506, 512, 512–513, 513, 513–515
AssetReveal.sol	94.35%	86.21%	96.55%	98.89%	143, 147, 181, 376, 416, 424, 441, 75, 98
AuthSuperValidator.sol	92%	87.50%	100%	90.91%	66–67
Catalyst.sol	95.14%	91.94%	95.83%	98.28%	124, 126, 139, 151, 223, 79
packages/asset/contracts/interfaces
IAsset.sol	100%	100%	100%	100%
IAssetCreate.sol	100%	100%	100%	100%
IAssetReveal.sol	100%	100%	100%	100%
ICatalyst.sol	100%	100%	100%	100%
IExchange.sol	100%	100%	100%	100%
ITokenUtils.sol	100%	100%	100%	100%
packages/asset/contracts/libraries
TokenIdUtils.sol	100%	100%	100%	100%
packages/marketplace/contracts
Exchange.sol	94.52%	93.33%	94.44%	96%	126, 194, 72
ExchangeCore.sol	98.85%	96.67%	100%	100%	85
OrderValidator.sol	96.83%	92.86%	100%	100%	110, 36
RoyaltiesRegistry.sol	96.32%	88.89%	100%	98.78%	194, 216–217, 263, 65
TransferManager.sol	94.86%	84.85%	100%	99.23%	150, 181, 191, 239, 379, 385, 400, 412–413, 424, 93
Whitelist.sol	75.81%	60%	85.71%	82.14%	104, 108–109, 122, 125, 141–142, 54, 66, 66–67, 71, 76
packages/marketplace/contracts/interfaces
IOrderValidator.sol	100%	100%	100%	100%
IRoyaltiesProvider.sol	100%	100%	100%	100%
ITransferManager.sol	100%	100%	100%	100%
IWhitelist.sol	100%	100%	100%	100%
packages/marketplace/contracts/libraries
LibAsset.sol	100%	100%	100%	100%
LibMath.sol	100%	100%	100%	100%
LibOrder.sol	100%	100%	100%	100%