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
40 });40 });
4141
42 async function deployMarket(helper: EthUniqueHelper, marketOwner: string) {42 async function deployMarket(helper: EthUniqueHelper, marketOwner: string) {
43 const nodeModulesDir = `${dirname}/../../../node_modules`;
44 const solApiDir = `${dirname}/../api`;
43 return await helper.ethContract.deployByCode(45 return await helper.ethContract.deployByCode(
44 marketOwner,46 marketOwner,
45 'Market',47 'Market',
46 (await readFile(`${dirname}/Market.sol`)).toString(),48 (await readFile(`${dirname}/Market.sol`)).toString(),
47 [49 [
48 {50 {
49 solPath: '@unique-nft/solidity-interfaces/contracts/UniqueNFT.sol',51 solPath: '@unique-nft/solidity-interfaces/contracts/UniqueNFT.sol',
50 fsPath: `${dirname}/../api/UniqueNFT.sol`,52 fsPath: `${solApiDir}/UniqueNFT.sol`,
51 },53 },
52 {54 {
53 solPath: '@unique-nft/solidity-interfaces/contracts/UniqueFungible.sol',55 solPath: '@unique-nft/solidity-interfaces/contracts/UniqueFungible.sol',
54 fsPath: `${dirname}/../api/UniqueFungible.sol`,56 fsPath: `${solApiDir}/UniqueFungible.sol`,
55 },57 },
56 {58 {
57 solPath: '@openzeppelin/contracts/utils/introspection/IERC165.sol',59 solPath: '@openzeppelin/contracts/utils/introspection/IERC165.sol',
58 fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/utils/introspection/IERC165.sol`,60 fsPath: `${nodeModulesDir}/@openzeppelin/contracts/utils/introspection/IERC165.sol`,
59 },61 },
60 {62 {
61 solPath: '@openzeppelin/contracts/access/Ownable.sol',63 solPath: '@openzeppelin/contracts/access/Ownable.sol',
62 fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/access/Ownable.sol`,64 fsPath: `${nodeModulesDir}/@openzeppelin/contracts/access/Ownable.sol`,
63 },65 },
64 {66 {
65 solPath: '@openzeppelin/contracts/utils/Context.sol',67 solPath: '@openzeppelin/contracts/utils/Context.sol',
66 fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/utils/Context.sol`,68 fsPath: `${nodeModulesDir}/@openzeppelin/contracts/utils/Context.sol`,
67 },69 },
68 {70 {
69 solPath: '@openzeppelin/contracts/security/ReentrancyGuard.sol',71 solPath: '@openzeppelin/contracts/security/ReentrancyGuard.sol',
70 fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/security/ReentrancyGuard.sol`,72 fsPath: `${nodeModulesDir}/@openzeppelin/contracts/security/ReentrancyGuard.sol`,
71 },73 },
72 {74 {
73 solPath: '@openzeppelin/contracts/utils/introspection/ERC165Checker.sol',75 solPath: '@openzeppelin/contracts/utils/introspection/ERC165Checker.sol',
74 fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol`,76 fsPath: `${nodeModulesDir}/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol`,
75 },77 },
76 {78 {
77 solPath: '@openzeppelin/contracts/token/ERC721/IERC721.sol',79 solPath: '@openzeppelin/contracts/token/ERC721/IERC721.sol',
78 fsPath: `${dirname}/../../../../node_modules/@openzeppelin/contracts/token/ERC721/IERC721.sol`,80 fsPath: `${nodeModulesDir}/@openzeppelin/contracts/token/ERC721/IERC721.sol`,
79 },81 },
80 {82 {
81 solPath: '@unique-nft/solidity-interfaces/contracts/CollectionHelpers.sol',83 solPath: '@unique-nft/solidity-interfaces/contracts/CollectionHelpers.sol',
82 fsPath: `${dirname}/../api/CollectionHelpers.sol`,84 fsPath: `${solApiDir}/CollectionHelpers.sol`,
83 },85 },
84 {86 {
85 solPath: 'royalty/UniqueRoyaltyHelper.sol',87 solPath: 'royalty/UniqueRoyaltyHelper.sol',
modifiedjs-packages/tests/package.jsondiffbeforeafterboth
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",