git.delta.rocks / unique-network / refs/commits / 50109b665ea6

difftreelog

fix RMRK disconnect

Daniel Shiposha2022-10-14parent: #2c2096c.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
@@ -103,5 +103,5 @@
     expect(isChild).to.be.false;
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/addResource.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/addResource.test.ts
+++ b/tests/src/rmrk/addResource.test.ts
@@ -432,6 +432,6 @@
 
 
   after(() => {
-    api.disconnect();
+    after(async() => { await api.disconnect(); });
   });
 });
modifiedtests/src/rmrk/addTheme.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/addTheme.test.ts
+++ b/tests/src/rmrk/addTheme.test.ts
@@ -125,5 +125,5 @@
     await expectTxFailure(/rmrkEquip\.PermissionError/, tx);
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/burnNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/burnNft.test.ts
+++ b/tests/src/rmrk/burnNft.test.ts
@@ -166,7 +166,5 @@
     });
   });
 
-  after(() => {
-    api.disconnect();
-  });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/changeCollectionIssuer.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/changeCollectionIssuer.test.ts
+++ b/tests/src/rmrk/changeCollectionIssuer.test.ts
@@ -49,7 +49,5 @@
     });
   });
 
-  after(() => {
-    api.disconnect();
-  });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/createBase.test.tsdiffbeforeafterboth
before · tests/src/rmrk/createBase.test.ts
1import {getApiConnection} from '../substrate/substrate-api';2import {requirePallets, Pallets} from './util/helpers';3import {createCollection, createBase} from './util/tx';45describe('integration test: create new Base', () => {6  let api: any;7  before(async function() {8    api = await getApiConnection();9    await requirePallets(this, [Pallets.RmrkCore, Pallets.RmrkEquip]);10  });1112  const alice = '//Alice';1314  it('create empty Base', async () => {15    await createBase(api, alice, 'empty-base-type', 'EBase', []);16  });1718  it('create Base with fixed part', async () => {19    await createBase(api, alice, 'fixedpart-base-type', 'FPBase', [20      {21        'FixedPart': {22          id: 42,23          z: 0,24          src: 'some-fixed-url',25        },26      },27    ]);28  });2930  it('create Base with slot part (no collection)', async () => {31    await createBase(api, alice, 'slotpart-base-type', 'SPBase', [32      {33        'SlotPart': {34          id: 112,35          equippable: 'Empty',36          z: 0,37          src: 'some-fallback-slot-url',38        },39      },40    ]);41  });4243  it('create Base with slot part (any collection)', async () => {44    await createBase(api, alice, 'slotpartany-base-type', 'SPABase', [45      {46        'SlotPart': {47          id: 222,48          equippable: 'All',49          z: 1,50          src: 'some-fallback-slot-url',51        },52      },53    ]);54  });5556  it('create Base with slot part (custom collections)', async () => {57    const firstCollectionId = await createCollection(58      api,59      alice,60      'first-collection-meta',61      null,62      'first-collection',63    );6465    const secondCollectionId = await createCollection(66      api,67      alice,68      'first-collection-meta',69      null,70      'first-collection',71    );7273    await createBase(api, alice, 'slotpartcustom-base-type', 'SPCBase', [74      {75        'SlotPart': {76          id: 1024,77          equippable: {78            'Custom': [firstCollectionId, secondCollectionId],79          },80          z: 2,81          src: 'some-fallback-slot-url',82        },83      },84    ]);85  });8687  after(() => { api.disconnect(); });88});
after · tests/src/rmrk/createBase.test.ts
1import {getApiConnection} from '../substrate/substrate-api';2import {requirePallets, Pallets} from './util/helpers';3import {createCollection, createBase} from './util/tx';45describe('integration test: create new Base', () => {6  let api: any;7  before(async function() {8    api = await getApiConnection();9    await requirePallets(this, [Pallets.RmrkCore, Pallets.RmrkEquip]);10  });1112  const alice = '//Alice';1314  it('create empty Base', async () => {15    await createBase(api, alice, 'empty-base-type', 'EBase', []);16  });1718  it('create Base with fixed part', async () => {19    await createBase(api, alice, 'fixedpart-base-type', 'FPBase', [20      {21        'FixedPart': {22          id: 42,23          z: 0,24          src: 'some-fixed-url',25        },26      },27    ]);28  });2930  it('create Base with slot part (no collection)', async () => {31    await createBase(api, alice, 'slotpart-base-type', 'SPBase', [32      {33        'SlotPart': {34          id: 112,35          equippable: 'Empty',36          z: 0,37          src: 'some-fallback-slot-url',38        },39      },40    ]);41  });4243  it('create Base with slot part (any collection)', async () => {44    await createBase(api, alice, 'slotpartany-base-type', 'SPABase', [45      {46        'SlotPart': {47          id: 222,48          equippable: 'All',49          z: 1,50          src: 'some-fallback-slot-url',51        },52      },53    ]);54  });5556  it('create Base with slot part (custom collections)', async () => {57    const firstCollectionId = await createCollection(58      api,59      alice,60      'first-collection-meta',61      null,62      'first-collection',63    );6465    const secondCollectionId = await createCollection(66      api,67      alice,68      'first-collection-meta',69      null,70      'first-collection',71    );7273    await createBase(api, alice, 'slotpartcustom-base-type', 'SPCBase', [74      {75        'SlotPart': {76          id: 1024,77          equippable: {78            'Custom': [firstCollectionId, secondCollectionId],79          },80          z: 2,81          src: 'some-fallback-slot-url',82        },83      },84    ]);85  });8687  after(async() => { await api.disconnect(); });88});
modifiedtests/src/rmrk/createCollection.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/createCollection.test.ts
+++ b/tests/src/rmrk/createCollection.test.ts
@@ -21,5 +21,5 @@
     await createCollection(api, alice, 'no-limit-metadata', null, 'no-limit-symbol');
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/deleteCollection.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/deleteCollection.test.ts
+++ b/tests/src/rmrk/deleteCollection.test.ts
@@ -42,7 +42,5 @@
     });
   });
 
-  after(() => {
-    api.disconnect();
-  });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/equipNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/equipNft.test.ts
+++ b/tests/src/rmrk/equipNft.test.ts
@@ -336,7 +336,5 @@
     await expectTxFailure(/rmrkEquip\.CollectionNotEquippable/, tx);
   });
 
-  after(() => {
-    api.disconnect();
-  });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/getOwnedNfts.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/getOwnedNfts.test.ts
+++ b/tests/src/rmrk/getOwnedNfts.test.ts
@@ -76,5 +76,5 @@
     });
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/lockCollection.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/lockCollection.test.ts
+++ b/tests/src/rmrk/lockCollection.test.ts
@@ -112,7 +112,5 @@
     });
   });
 
-  after(() => {
-    api.disconnect();
-  });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/mintNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/mintNft.test.ts
+++ b/tests/src/rmrk/mintNft.test.ts
@@ -207,5 +207,5 @@
     expect(nft.isSome).to.be.false;
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/rejectNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/rejectNft.test.ts
+++ b/tests/src/rmrk/rejectNft.test.ts
@@ -90,5 +90,5 @@
     await expectTxFailure(/rmrkCore\.CannotRejectNonPendingNft/, tx);
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/removeResource.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/removeResource.test.ts
+++ b/tests/src/rmrk/removeResource.test.ts
@@ -343,7 +343,5 @@
     await expectTxFailure(/rmrkCore\.NoPermission/, tx);
   });
 
-  after(() => {
-    api.disconnect();
-  });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/rmrkIsolation.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/rmrkIsolation.test.ts
+++ b/tests/src/rmrk/rmrkIsolation.test.ts
@@ -90,7 +90,7 @@
       bob = privateKey('//Bob');
       normalizedAlice = {Substrate: helper.address.normalizeSubstrateToChainFormat(alice.address)};
 
-      requirePalletsOrSkip(this, helper, [Pallets.RmrkCore]);
+      await requirePalletsOrSkip(this, helper, [Pallets.RmrkCore]);
 
       const collectionIds = await createRmrkCollection(helper, alice);
       uniqueCollectionId = collectionIds.uniqueId;
modifiedtests/src/rmrk/sendNft.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/sendNft.test.ts
+++ b/tests/src/rmrk/sendNft.test.ts
@@ -251,5 +251,5 @@
     await expectTxFailure(/rmrkCore\.NoPermission/, tx);
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/setCollectionProperty.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setCollectionProperty.test.ts
+++ b/tests/src/rmrk/setCollectionProperty.test.ts
@@ -62,7 +62,5 @@
     });
   });
 
-  after(() => {
-    api.disconnect();
-  });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/setEquippableList.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setEquippableList.test.ts
+++ b/tests/src/rmrk/setEquippableList.test.ts
@@ -110,5 +110,5 @@
     await expectTxFailure(/rmrkEquip\.PartDoesntExist/, tx);
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/setNftProperty.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setNftProperty.test.ts
+++ b/tests/src/rmrk/setNftProperty.test.ts
@@ -84,5 +84,5 @@
     await expectTxFailure(/rmrkCore\.NoPermission/, tx);
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });
modifiedtests/src/rmrk/setResourcePriorities.test.tsdiffbeforeafterboth
--- a/tests/src/rmrk/setResourcePriorities.test.ts
+++ b/tests/src/rmrk/setResourcePriorities.test.ts
@@ -54,5 +54,5 @@
     await expectTxFailure(/rmrkCore\.NoAvailableNftId/, tx);
   });
 
-  after(() => { api.disconnect(); });
+  after(async() => { await api.disconnect(); });
 });