git.delta.rocks / unique-network / refs/commits / 698c51fd21a7

difftreelog

fix move RMRK needed parts of deprecated helpers

Daniel Shiposha2022-10-11parent: #681fe40.patch.diff
in: master

20 files changed

modifiedtests/src/rmrk/acceptNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/acceptNft.test.ts
+++ b/tests/src/rmrk/acceptNft.test.ts
@@ -7,8 +7,7 @@
   acceptNft,
 } from './util/tx';
 import {NftIdTuple} from './util/fetch';
-import {isNftChildOfAnother, expectTxFailure} from './util/helpers';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
+import {isNftChildOfAnother, expectTxFailure, requirePallets, Pallets} from './util/helpers';
 
 describe('integration test: accept NFT', () => {
   let api: any;
modifiedtests/src/rmrk/addResource.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/addResource.test.ts
+++ b/tests/src/rmrk/addResource.test.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import {getApiConnection} from '../substrate/substrate-api';
 import {NftIdTuple} from './util/fetch';
-import {expectTxFailure, getResourceById} from './util/helpers';
+import {expectTxFailure, getResourceById, requirePallets, Pallets} from './util/helpers';
 import {
   addNftBasicResource,
   acceptNftResource,
@@ -12,7 +12,6 @@
   addNftComposableResource,
 } from './util/tx';
 import {RmrkTraitsResourceResourceInfo as ResourceInfo} from '@polkadot/types/lookup';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
 
 describe('integration test: add NFT resource', () => {
   const Alice = '//Alice';
modifiedtests/src/rmrk/addTheme.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/addTheme.test.ts
+++ b/tests/src/rmrk/addTheme.test.ts
@@ -1,9 +1,8 @@
 import {expect} from 'chai';
 import {getApiConnection} from '../substrate/substrate-api';
 import {createBase, addTheme} from './util/tx';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {getThemeNames} from './util/fetch';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
 
 describe('integration test: add Theme to Base', () => {
   let api: any;
modifiedtests/src/rmrk/burnNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/burnNft.test.ts
+++ b/tests/src/rmrk/burnNft.test.ts
@@ -1,11 +1,10 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {NftIdTuple, getChildren} from './util/fetch';
 import {burnNft, createCollection, sendNft, mintNft} from './util/tx';
 
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
 
 chai.use(chaiAsPromised);
 const expect = chai.expect;
modifiedtests/src/rmrk/changeCollectionIssuer.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/changeCollectionIssuer.test.ts
+++ b/tests/src/rmrk/changeCollectionIssuer.test.ts
@@ -1,6 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {
   changeIssuer,
   createCollection,
modifiedtests/src/rmrk/createBase.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/createBase.test.ts
+++ b/tests/src/rmrk/createBase.test.ts
@@ -1,5 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
+import {requirePallets, Pallets} from './util/helpers';
 import {createCollection, createBase} from './util/tx';
 
 describe('integration test: create new Base', () => {
modifiedtests/src/rmrk/createCollection.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/createCollection.test.ts
+++ b/tests/src/rmrk/createCollection.test.ts
@@ -1,5 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
+import {requirePallets, Pallets} from './util/helpers';
 import {createCollection} from './util/tx';
 
 describe('Integration test: create new collection', () => {
modifiedtests/src/rmrk/deleteCollection.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/deleteCollection.test.ts
+++ b/tests/src/rmrk/deleteCollection.test.ts
@@ -1,6 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {createCollection, deleteCollection} from './util/tx';
 
 describe('integration test: delete collection', () => {
modifiedtests/src/rmrk/equipNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/equipNft.test.ts
+++ b/tests/src/rmrk/equipNft.test.ts
@@ -1,9 +1,8 @@
 import {ApiPromise} from '@polkadot/api';
 import {expect} from 'chai';
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
 import {getNft, getParts, NftIdTuple} from './util/fetch';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {
   addNftComposableResource,
   addNftSlotResource,
modifiedtests/src/rmrk/getOwnedNfts.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/getOwnedNfts.test.ts
+++ b/tests/src/rmrk/getOwnedNfts.test.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
+import {requirePallets, Pallets} from './util/helpers';
 import {getOwnedNfts} from './util/fetch';
 import {mintNft, createCollection} from './util/tx';
modifiedtests/src/rmrk/lockCollection.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/lockCollection.test.ts
+++ b/tests/src/rmrk/lockCollection.test.ts
@@ -1,6 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {createCollection, lockCollection, mintNft} from './util/tx';
 
 describe('integration test: lock collection', () => {
modifiedtests/src/rmrk/mintNft.test.tsdiffbeforeafterboth
before · tests/src/rmrk/mintNft.test.ts
1import {expect} from 'chai';2import {getApiConnection} from '../substrate/substrate-api';3import {requirePallets, Pallets} from '../deprecated-helpers/helpers';4import {getNft} from './util/fetch';5import {expectTxFailure} from './util/helpers';6import {createCollection, mintNft} from './util/tx';78describe('integration test: mint new NFT', () => {9  let api: any;10 11  before(async function () {12    api = await getApiConnection();13    await requirePallets(this, [Pallets.RmrkCore]);14  });151617  const alice = '//Alice';18  const bob = '//Bob';19  const maxCollectionId = 0xFFFFFFFF;20  const maxNftId = 0xFFFFFFFF;2122  it('mint NFT', async () => {23    const owner = null;24    const collectionMetadata = 'mintingCollectionMetadata';25    const collectionMax = null;26    const collectionSymbol = 'MCS';27    const recipientUri = null;28    const royalty = null;29    const nftMetadata = 'NFT-test-metadata';3031    const collectionId = await createCollection(32      api,33      alice,34      collectionMetadata,35      collectionMax,36      collectionSymbol,37    );3839    await mintNft(40      api,41      alice,42      owner,43      collectionId,44      nftMetadata,45      recipientUri,46      royalty,47    );48  });4950  it('mint NFT and set another owner', async () => {51    const owner = bob;52    const collectionMetadata = 'setOwnerCollectionMetadata';53    const collectionMax = null;54    const collectionSymbol = 'SOCS';55    const recipientUri = null;56    const royalty = null;57    const nftMetadata = 'setOwner-NFT-metadata';5859    const collectionId = await createCollection(60      api,61      alice,62      collectionMetadata,63      collectionMax,64      collectionSymbol,65    );6667    await mintNft(68      api,69      alice,70      owner,71      collectionId,72      nftMetadata,73      recipientUri,74      royalty,75    );76  });7778  it('mint NFT with recipient and roalty', async () => {79    const owner = alice;80    const collectionMetadata = 'mintingCollectionMetadata';81    const collectionMax = null;82    const collectionSymbol = 'MCS';83    const recipientUri = bob;84    const royalty = 70000;85    const nftMetadata = 'recipient-royalty-NFT-test-metadata';8687    const collectionId = await createCollection(88      api,89      alice,90      collectionMetadata,91      collectionMax,92      collectionSymbol,93    );9495    await mintNft(96      api,97      alice,98      owner,99      collectionId,100      nftMetadata,101      recipientUri,102      royalty,103    );104  });105106  it('mint NFT with resources', async () => {107    const owner = alice;108    const collectionMetadata = 'mintingCollectionMetadata';109    const collectionMax = null;110    const collectionSymbol = 'MCS';111    const nftMetadata = 'NFT-with-resources-test-metadata';112    const resources = [113      {114        basic: {115          metadata: 'basic-resource-nft-minting',116        },117      }, {118        slot: {119          metadata: 'slot-resource-nft-minting',120          slot: 9,121        },122      }, {123        composable: {124          metadata: 'composable-resource-nft-minting',125          parts: [0, 5, 2],126        },127      }, {128        slot: {129          metadata: 'slot-resource-nft-minting-2',130          thumb: 'srnm2',131          base: 5,132        },133      },134    ];135136    const collectionId = await createCollection(137      api,138      alice,139      collectionMetadata,140      collectionMax,141      collectionSymbol,142    );143144    await mintNft(145      api,146      alice,147      owner,148      collectionId,149      nftMetadata,150      null,151      null,152      true,153      resources,154    );155  });156157  it('[negative] unable to mint NFT within non-existing collection', async () => {158    const owner = alice;159    const recipientUri = null;160    const royalty = null;161    const nftMetadata = 'NFT-test-metadata';162163    const tx = mintNft(164      api,165      alice,166      owner,167      maxCollectionId,168      nftMetadata,169      recipientUri,170      royalty,171    );172173    await expectTxFailure(/rmrkCore\.CollectionUnknown/, tx);174  });175176  it("[negative] unable to mint NFT by a user that isn't the owner of the collection", async () => {177    const owner = alice;178    const collectionMetadata = 'mintingCollectionMetadata';179    const collectionMax = null;180    const collectionSymbol = 'MCS';181    const recipientUri = null;182    const royalty = null;183    const nftMetadata = 'NFT-test-metadata';184185    const collectionId = await createCollection(186      api,187      alice,188      collectionMetadata,189      collectionMax,190      collectionSymbol,191    );192193    const tx = mintNft(194      api,195      bob,196      owner,197      collectionId,198      nftMetadata,199      recipientUri,200      royalty,201    );202203    await expectTxFailure(/rmrkCore\.NoPermission/, tx);204  });205206  it('[negative] unable to fetch non-existing NFT', async () => {207    const nft = await getNft(api, maxCollectionId, maxNftId);208    expect(nft.isSome).to.be.false;209  });210211  after(() => { api.disconnect(); });212});
after · tests/src/rmrk/mintNft.test.ts
1import {expect} from 'chai';2import {getApiConnection} from '../substrate/substrate-api';3import {getNft} from './util/fetch';4import {expectTxFailure, requirePallets, Pallets} from './util/helpers';5import {createCollection, mintNft} from './util/tx';67describe('integration test: mint new NFT', () => {8  let api: any;9 10  before(async function () {11    api = await getApiConnection();12    await requirePallets(this, [Pallets.RmrkCore]);13  });141516  const alice = '//Alice';17  const bob = '//Bob';18  const maxCollectionId = 0xFFFFFFFF;19  const maxNftId = 0xFFFFFFFF;2021  it('mint NFT', async () => {22    const owner = null;23    const collectionMetadata = 'mintingCollectionMetadata';24    const collectionMax = null;25    const collectionSymbol = 'MCS';26    const recipientUri = null;27    const royalty = null;28    const nftMetadata = 'NFT-test-metadata';2930    const collectionId = await createCollection(31      api,32      alice,33      collectionMetadata,34      collectionMax,35      collectionSymbol,36    );3738    await mintNft(39      api,40      alice,41      owner,42      collectionId,43      nftMetadata,44      recipientUri,45      royalty,46    );47  });4849  it('mint NFT and set another owner', async () => {50    const owner = bob;51    const collectionMetadata = 'setOwnerCollectionMetadata';52    const collectionMax = null;53    const collectionSymbol = 'SOCS';54    const recipientUri = null;55    const royalty = null;56    const nftMetadata = 'setOwner-NFT-metadata';5758    const collectionId = await createCollection(59      api,60      alice,61      collectionMetadata,62      collectionMax,63      collectionSymbol,64    );6566    await mintNft(67      api,68      alice,69      owner,70      collectionId,71      nftMetadata,72      recipientUri,73      royalty,74    );75  });7677  it('mint NFT with recipient and roalty', async () => {78    const owner = alice;79    const collectionMetadata = 'mintingCollectionMetadata';80    const collectionMax = null;81    const collectionSymbol = 'MCS';82    const recipientUri = bob;83    const royalty = 70000;84    const nftMetadata = 'recipient-royalty-NFT-test-metadata';8586    const collectionId = await createCollection(87      api,88      alice,89      collectionMetadata,90      collectionMax,91      collectionSymbol,92    );9394    await mintNft(95      api,96      alice,97      owner,98      collectionId,99      nftMetadata,100      recipientUri,101      royalty,102    );103  });104105  it('mint NFT with resources', async () => {106    const owner = alice;107    const collectionMetadata = 'mintingCollectionMetadata';108    const collectionMax = null;109    const collectionSymbol = 'MCS';110    const nftMetadata = 'NFT-with-resources-test-metadata';111    const resources = [112      {113        basic: {114          metadata: 'basic-resource-nft-minting',115        },116      }, {117        slot: {118          metadata: 'slot-resource-nft-minting',119          slot: 9,120        },121      }, {122        composable: {123          metadata: 'composable-resource-nft-minting',124          parts: [0, 5, 2],125        },126      }, {127        slot: {128          metadata: 'slot-resource-nft-minting-2',129          thumb: 'srnm2',130          base: 5,131        },132      },133    ];134135    const collectionId = await createCollection(136      api,137      alice,138      collectionMetadata,139      collectionMax,140      collectionSymbol,141    );142143    await mintNft(144      api,145      alice,146      owner,147      collectionId,148      nftMetadata,149      null,150      null,151      true,152      resources,153    );154  });155156  it('[negative] unable to mint NFT within non-existing collection', async () => {157    const owner = alice;158    const recipientUri = null;159    const royalty = null;160    const nftMetadata = 'NFT-test-metadata';161162    const tx = mintNft(163      api,164      alice,165      owner,166      maxCollectionId,167      nftMetadata,168      recipientUri,169      royalty,170    );171172    await expectTxFailure(/rmrkCore\.CollectionUnknown/, tx);173  });174175  it("[negative] unable to mint NFT by a user that isn't the owner of the collection", async () => {176    const owner = alice;177    const collectionMetadata = 'mintingCollectionMetadata';178    const collectionMax = null;179    const collectionSymbol = 'MCS';180    const recipientUri = null;181    const royalty = null;182    const nftMetadata = 'NFT-test-metadata';183184    const collectionId = await createCollection(185      api,186      alice,187      collectionMetadata,188      collectionMax,189      collectionSymbol,190    );191192    const tx = mintNft(193      api,194      bob,195      owner,196      collectionId,197      nftMetadata,198      recipientUri,199      royalty,200    );201202    await expectTxFailure(/rmrkCore\.NoPermission/, tx);203  });204205  it('[negative] unable to fetch non-existing NFT', async () => {206    const nft = await getNft(api, maxCollectionId, maxNftId);207    expect(nft.isSome).to.be.false;208  });209210  after(() => { api.disconnect(); });211});
modifiedtests/src/rmrk/rejectNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/rejectNft.test.ts
+++ b/tests/src/rmrk/rejectNft.test.ts
@@ -7,8 +7,7 @@
   rejectNft,
 } from './util/tx';
 import {getChildren, NftIdTuple} from './util/fetch';
-import {isNftChildOfAnother, expectTxFailure} from './util/helpers';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
+import {isNftChildOfAnother, expectTxFailure, requirePallets, Pallets} from './util/helpers';
 
 describe('integration test: reject NFT', () => {
   let api: any;
modifiedtests/src/rmrk/removeResource.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/removeResource.test.ts
+++ b/tests/src/rmrk/removeResource.test.ts
@@ -1,9 +1,8 @@
 import {expect} from 'chai';
 import privateKey from '../substrate/privateKey';
 import {executeTransaction, getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
 import {getNft, NftIdTuple} from './util/fetch';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {
   acceptNft, acceptResourceRemoval, addNftBasicResource,
   createBase,
modifiedtests/src/rmrk/sendNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/sendNft.test.ts
+++ b/tests/src/rmrk/sendNft.test.ts
@@ -2,8 +2,7 @@
 import {getApiConnection} from '../substrate/substrate-api';
 import {createCollection, mintNft, sendNft} from './util/tx';
 import {NftIdTuple} from './util/fetch';
-import {isNftChildOfAnother, expectTxFailure} from './util/helpers';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
+import {isNftChildOfAnother, expectTxFailure, requirePallets, Pallets} from './util/helpers';
 
 describe('integration test: send NFT', () => {
   let api: any;
modifiedtests/src/rmrk/setCollectionProperty.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setCollectionProperty.test.ts
+++ b/tests/src/rmrk/setCollectionProperty.test.ts
@@ -1,6 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {createCollection, setPropertyCollection} from './util/tx';
 
 describe('integration test: set collection property', () => {
modifiedtests/src/rmrk/setEquippableList.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setEquippableList.test.ts
+++ b/tests/src/rmrk/setEquippableList.test.ts
@@ -1,6 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {createCollection, createBase, setEquippableList} from './util/tx';
 
 describe("integration test: set slot's Equippable List", () => {
modifiedtests/src/rmrk/setNftProperty.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setNftProperty.test.ts
+++ b/tests/src/rmrk/setNftProperty.test.ts
@@ -1,7 +1,6 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
 import {NftIdTuple} from './util/fetch';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {createCollection, mintNft, sendNft, setNftProperty} from './util/tx';
 
 describe('integration test: set NFT property', () => {
modifiedtests/src/rmrk/setResourcePriorities.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setResourcePriorities.test.ts
+++ b/tests/src/rmrk/setResourcePriorities.test.ts
@@ -1,6 +1,5 @@
 import {getApiConnection} from '../substrate/substrate-api';
-import {requirePallets, Pallets} from '../deprecated-helpers/helpers';
-import {expectTxFailure} from './util/helpers';
+import {expectTxFailure, requirePallets, Pallets} from './util/helpers';
 import {mintNft, createCollection, setResourcePriorities} from './util/tx';
 
 describe('integration test: set NFT resource priorities', () => {
modifiedtests/src/rmrk/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/rmrk/util/helpers.ts
+++ b/tests/src/rmrk/util/helpers.ts
@@ -10,6 +10,8 @@
 import {NftIdTuple, getChildren, getOwnedNfts, getCollectionProperties, getNftProperties, getResources} from './fetch';
 import chaiAsPromised from 'chai-as-promised';
 import chai from 'chai';
+import {getApiConnection} from '../../substrate/substrate-api';
+import {Context} from 'mocha';
 
 chai.use(chaiAsPromised);
 const expect = chai.expect;
@@ -19,6 +21,45 @@
     successData: T | null;
 }
 
+export enum Pallets {
+  Inflation = 'inflation',
+  RmrkCore = 'rmrkcore',
+  RmrkEquip = 'rmrkequip',
+  ReFungible = 'refungible',
+  Fungible = 'fungible',
+  NFT = 'nonfungible',
+  Scheduler = 'scheduler',
+  AppPromotion = 'apppromotion',
+}
+
+let modulesNames: any;
+export function getModuleNames(api: ApiPromise): string[] {
+  if (typeof modulesNames === 'undefined')
+    modulesNames = api.runtimeMetadata.asLatest.pallets.map(m => m.name.toString().toLowerCase());
+  return modulesNames;
+}
+
+export async function missingRequiredPallets(requiredPallets: string[]): Promise<string[]> {
+  const api = await getApiConnection();
+  const pallets = getModuleNames(api);
+
+  return requiredPallets.filter(p => !pallets.includes(p));
+}
+
+export async function requirePallets(mocha: Context, requiredPallets: string[]) {
+  const missingPallets = await missingRequiredPallets(requiredPallets);
+
+  if (missingPallets.length > 0) {
+    const skippingTestMsg = `\tSkipping test "${mocha.test?.title}".`;
+    const missingPalletsMsg = `\tThe following pallets are missing:\n\t- ${missingPallets.join('\n\t- ')}`;
+    const skipMsg = `${skippingTestMsg}\n${missingPalletsMsg}`;
+
+    console.error('\x1b[38:5:208m%s\x1b[0m', skipMsg);
+
+    mocha.skip();
+  }
+}
+
 export function makeNftOwner(api: ApiPromise, owner: string | NftIdTuple): NftOwner {
   const isNftSending = (typeof owner !== 'string');