git.delta.rocks / unique-network / refs/commits / beb0dfd79b5e

--- a/js-packages/tests/eth/marketplace-v2/marketplace.test.ts
+++ b/js-packages/tests/eth/marketplace-v2/marketplace.test.ts
@@ -40,6 +40,8 @@
   });
 
   async function deployMarket(helper: EthUniqueHelper, marketOwner: string) {
+    const nodeModulesDir = `${dirname}/../../../node_modules`;
+    const solApiDir = `${dirname}/../api`;
     return await helper.ethContract.deployByCode(
       marketOwner,
       'Market',
@@ -47,39 +49,39 @@
       [
         {
           solPath: '@unique-nft/solidity-interfaces/contracts/UniqueNFT.sol',
-          fsPath: `${dirname}/../api/UniqueNFT.sol`,
+          fsPath: `${solApiDir}/UniqueNFT.sol`,
         },
         {
           solPath: '@unique-nft/solidity-interfaces/contracts/UniqueFungible.sol',
-          fsPath: `${dirname}/../api/UniqueFungible.sol`,
+          fsPath: `${solApiDir}/UniqueFungible.sol`,
         },
         {
           solPath: '@openzeppelin/contracts/utils/introspection/IERC165.sol',
-          fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/utils/introspection/IERC165.sol`,
+          fsPath: `${nodeModulesDir}/@openzeppelin/contracts/utils/introspection/IERC165.sol`,
         },
         {
           solPath: '@openzeppelin/contracts/access/Ownable.sol',
-          fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/access/Ownable.sol`,
+          fsPath: `${nodeModulesDir}/@openzeppelin/contracts/access/Ownable.sol`,
         },
         {
           solPath: '@openzeppelin/contracts/utils/Context.sol',
-          fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/utils/Context.sol`,
+          fsPath: `${nodeModulesDir}/@openzeppelin/contracts/utils/Context.sol`,
         },
         {
           solPath: '@openzeppelin/contracts/security/ReentrancyGuard.sol',
-          fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/security/ReentrancyGuard.sol`,
+          fsPath: `${nodeModulesDir}/@openzeppelin/contracts/security/ReentrancyGuard.sol`,
         },
         {
           solPath: '@openzeppelin/contracts/utils/introspection/ERC165Checker.sol',
-          fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol`,
+          fsPath: `${nodeModulesDir}/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol`,
         },
         {
           solPath: '@openzeppelin/contracts/token/ERC721/IERC721.sol',
-          fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/token/ERC721/IERC721.sol`,
+          fsPath: `${nodeModulesDir}/@openzeppelin/contracts/token/ERC721/IERC721.sol`,
         },
         {
           solPath: '@unique-nft/solidity-interfaces/contracts/CollectionHelpers.sol',
-          fsPath: `${dirname}/../api/CollectionHelpers.sol`,
+          fsPath: `${solApiDir}/CollectionHelpers.sol`,
         },
         {
           solPath: 'royalty/UniqueRoyaltyHelper.sol',

21        "test": "yarn _test './**/*.*test.ts'",21        "test": "yarn _test './**/*.*test.ts'",
22        "testParallel": "yarn _testParallel './**/*.test.ts'",22        "testParallel": "yarn _testParallel './**/*.test.ts'",
23        "testSequential": "yarn _test './**/*.seqtest.ts'",23        "testSequential": "yarn _test './**/*.seqtest.ts'",
24        "testEth": "yarn _test ./**/eth/*.*test.ts",
24        "testGovernance": "RUN_GOV_TESTS=1 yarn _test ./**/governance/*.*test.ts",25        "testGovernance": "RUN_GOV_TESTS=1 yarn _test ./**/governance/*.*test.ts",
25        "testCollators": "RUN_COLLATOR_TESTS=1 yarn _test ./**/collator-selection/**.*test.ts --timeout 49999999",26        "testCollators": "RUN_COLLATOR_TESTS=1 yarn _test ./**/collator-selection/**.*test.ts --timeout 49999999",
26        "testFullXcmUnique": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/*Unique.test.ts",27        "testFullXcmUnique": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/*Unique.test.ts",