[TD-1326] Restructure trading tests to match trading contracts directory layout (#190)

Author: lfportal

test/seaport/immutableseaport.test.ts renamed to test/trading/seaport/immutableseaport.test.ts

@@ -2,7 +2,7 @@
 import { ethers, network } from "hardhat";
 import { randomBytes } from "crypto";
 
-import type { ImmutableSeaport, ImmutableSignedZone, TestERC721 } from "../../typechain-types";
+import type { ImmutableSeaport, ImmutableSignedZone, TestERC721 } from "../../../typechain-types";
 import { constants } from "ethers";
 import type { Wallet, BigNumber, BigNumberish } from "ethers";
 import { deployImmutableContracts } from "./utils/deploy-immutable-contracts";

test/seaport/utils/criteria.ts renamed to test/trading/seaport/utils/criteria.ts

@@ -1,5 +1,5 @@
 import hre from "hardhat";
-import { ImmutableSeaport, ImmutableSignedZone } from "../../../typechain-types";
+import { ImmutableSeaport, ImmutableSignedZone } from "../../../../typechain-types";
 
 // Deploy the Immutable ecosystem contracts, returning the contract
 // references

test/seaport/utils/deploy-immutable-contracts.ts renamed to test/trading/seaport/utils/deploy-immutable-contracts.ts

@@ -3,12 +3,12 @@ import hre from "hardhat";
 
 import { getOfferOrConsiderationItem, randomBN } from "./encoding";
 
-import type { TestERC721 } from "../../../typechain-types";
+import type { TestERC721 } from "../../../../typechain-types";
 import type { BigNumberish, BigNumber, Contract, Wallet } from "ethers";
 
 export async function deployERC721(): Promise<TestERC721> {
   const erc721Factory = await hre.ethers.getContractFactory("TestERC721");
-  const erc721 = await erc721Factory.deploy();
+  const erc721 = (await erc721Factory.deploy()) as TestERC721;
   return erc721.deployed();
 }
 

test/seaport/utils/eip712/Eip712MerkleTree.ts renamed to test/trading/seaport/utils/eip712/Eip712MerkleTree.ts

@@ -7,9 +7,9 @@ import { calculateOrderHash, convertSignatureToEIP2098, randomHex, toBN } from "
 
 import type { ConsiderationItem, OfferItem, OrderComponents } from "./types";
 import type { Contract, Wallet } from "ethers";
-import { ImmutableSeaport, TestZone } from "../../../typechain-types";
+import { ImmutableSeaport, TestZone } from "../../../../typechain-types";
 import { getBulkOrderTree } from "./eip712/bulk-orders";
-import { ReceivedItemStruct } from "../../../typechain-types/contracts/ImmutableSeaport";
+import { ReceivedItemStruct } from "../../../../typechain-types/contracts/trading/seaport/ImmutableSeaport";
 import { CONSIDERATION_EIP712_TYPE, EIP712_DOMAIN, SIGNED_ORDER_EIP712_TYPE, getCurrentTimeStamp } from "./signedZone";
 
 const orderType = {

test/seaport/utils/eip712/bulk-orders.ts renamed to test/trading/seaport/utils/eip712/bulk-orders.ts

@@ -5,7 +5,7 @@ import { Wallet, constants } from "ethers";
 import { keccak256 } from "ethers/lib/utils";
 import { ethers } from "hardhat";
 
-import { ImmutableSignedZone__factory } from "../../typechain-types";
+import { ImmutableSignedZone__factory } from "../../../../typechain-types";
 
 import {
   CONSIDERATION_EIP712_TYPE,
@@ -15,13 +15,13 @@ import {
   autoMining,
   convertSignatureToEIP2098,
   getCurrentTimeStamp,
-} from "./utils/signedZone";
+} from "../utils/signedZone";
 
-import type { ImmutableSignedZone } from "../../typechain-types";
+import type { ImmutableSignedZone } from "../../../../typechain-types";
 import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import type { BytesLike } from "ethers";
-import { ReceivedItemStruct } from "../../typechain-types/contracts/trading/seaport/ImmutableSeaport";
-import { ZoneParametersStruct } from "../../typechain-types/contracts/trading/seaport/zones/ImmutableSignedZone";
+import { ReceivedItemStruct } from "../../../../typechain-types/contracts/trading/seaport/ImmutableSeaport";
+import { ZoneParametersStruct } from "../../../../typechain-types/contracts/trading/seaport/zones/ImmutableSignedZone";
 
 describe("ImmutableSignedZone", function () {
   let deployer: SignerWithAddress;

test/seaport/utils/eip712/defaults.ts renamed to test/trading/seaport/utils/eip712/defaults.ts

@@ -9,5 +9,6 @@
     "resolveJsonModule": true,
     "skipLibCheck": true
   },
-  "include": ["./index.ts"]
+  "include": ["./index.ts", "./test/**/*.ts"],
+  "files": ["hardhat.config.ts"]
 }