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

difftreelog

fix @openzeppelin path

Andy Smith2023-11-20parent: #ec6ce24.patch.diff
in: master

2 files changed

modifiedjs-packages/tests/eth/marketplace-v2/marketplace.test.tsdiffbeforeafterboth
--- 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',
modifiedjs-packages/tests/package.jsondiffbeforeafterboth
before · js-packages/tests/package.json
1{2    "author": "",3    "license": "SEE LICENSE IN ../../../LICENSE",4    "description": "Interfaces for interacting with contracts and contract ABIs",5    "engines": {6        "node": ">=16"7    },8    "name": "@unique/tests",9    "type": "module",10    "version": "1.0.0",11    "main": "",12    "devDependencies": {13        "mocha": "^10.1.0"14    },15    "scripts": {16        "setup": "yarn ts-node --esm ./util/globalSetup.ts",17        "setIdentities": "yarn ts-node --esm ./util/identitySetter.ts",18        "checkRelayIdentities": "yarn ts-node --esm ./util/relayIdentitiesChecker.ts",19        "_test": "yarn setup && yarn mocha --timeout 9999999 --loader=ts-node/esm.mjs",20        "_testParallel": "yarn setup && yarn mocha --timeout 9999999 --parallel --loader=ts-node/esm.mjs",21        "test": "yarn _test './**/*.*test.ts'",22        "testParallel": "yarn _testParallel './**/*.test.ts'",23        "testSequential": "yarn _test './**/*.seqtest.ts'",24        "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        "testFullXcmUnique": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/*Unique.test.ts",27        "testFullXcmQuartz": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/*Quartz.test.ts",28        "testXcmOpal": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/xcmOpal.test.ts",29        "load": "yarn _test './**/*.load.ts'"30    }31}
after · js-packages/tests/package.json
1{2    "author": "",3    "license": "SEE LICENSE IN ../../../LICENSE",4    "description": "Interfaces for interacting with contracts and contract ABIs",5    "engines": {6        "node": ">=16"7    },8    "name": "@unique/tests",9    "type": "module",10    "version": "1.0.0",11    "main": "",12    "devDependencies": {13        "mocha": "^10.1.0"14    },15    "scripts": {16        "setup": "yarn ts-node --esm ./util/globalSetup.ts",17        "setIdentities": "yarn ts-node --esm ./util/identitySetter.ts",18        "checkRelayIdentities": "yarn ts-node --esm ./util/relayIdentitiesChecker.ts",19        "_test": "yarn setup && yarn mocha --timeout 9999999 --loader=ts-node/esm.mjs",20        "_testParallel": "yarn setup && yarn mocha --timeout 9999999 --parallel --loader=ts-node/esm.mjs",21        "test": "yarn _test './**/*.*test.ts'",22        "testParallel": "yarn _testParallel './**/*.test.ts'",23        "testSequential": "yarn _test './**/*.seqtest.ts'",24        "testEth": "yarn _test ./**/eth/*.*test.ts",25        "testGovernance": "RUN_GOV_TESTS=1 yarn _test ./**/governance/*.*test.ts",26        "testCollators": "RUN_COLLATOR_TESTS=1 yarn _test ./**/collator-selection/**.*test.ts --timeout 49999999",27        "testFullXcmUnique": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/*Unique.test.ts",28        "testFullXcmQuartz": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/*Quartz.test.ts",29        "testXcmOpal": "RUN_XCM_TESTS=1 yarn _test ./**/xcm/xcmOpal.test.ts",30        "load": "yarn _test './**/*.load.ts'"31    }32}