git.delta.rocks / unique-network / refs/commits / 464a3c1ac005

difftreelog

fix properties have been moved in creation functions

kryadinskii2022-05-20parent: #fc4f875.patch.diff
in: master

5 files changed

modifiedtests/src/createItem.test.tsdiffbeforeafterboth
--- a/tests/src/createItem.test.ts
+++ b/tests/src/createItem.test.ts
@@ -24,6 +24,7 @@
   addCollectionAdminExpectSuccess,
   createCollectionWithPropsExpectSuccess,
   createItemWithPropsExpectSuccess,
+  createItemWithPropsExpectFailure,
 } from './util/helpers';
 
 const expect = chai.expect;
@@ -128,69 +129,47 @@
       const createMode = 'NFT';
       const newCollectionID = await createCollectionWithPropsExpectSuccess({mode: {type: createMode}, 
         propPerm:   [{key: 'key1', permission: {mutable: false, collectionAdmin: false, tokenOwner: false}}]});
-
-      const token = await createItemExpectSuccess(alice, newCollectionID, 'NFT');
       await addCollectionAdminExpectSuccess(alice, newCollectionID, bob.address);
 
-      await expect(executeTransaction(
-        api, 
-        alice, 
-        api.tx.unique.setTokenProperties(newCollectionID, token, [{key: 'key1', value: 'v2'}]), 
-      )).to.be.rejected;
+      await createItemWithPropsExpectFailure(bob, newCollectionID, 'NFT', [{key: 'key1', value: 'v'}]);
     });
   });
 
   it('User doesnt have editing rights', async () => {
     await usingApi(async api => {
       const newCollectionID = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'key1', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}]});
-      const token = await createItemExpectSuccess(alice, newCollectionID, 'NFT');
-
-      await expect(executeTransaction(
-        api, 
-        bob, 
-        api.tx.unique.setTokenProperties(newCollectionID, token, [{key: 'key1', value: 'v2'}]), 
-      )).to.be.rejected;
+      await createItemWithPropsExpectFailure(bob, newCollectionID, 'NFT', [{key: 'key1', value: 'v'}]);
     });
   });
 
   it('Adding property without access rights', async () => {
     await usingApi(async api => {
-      const createMode = 'NFT';
-      const newCollectionID = await createCollectionExpectSuccess({mode: {type: createMode}});
-
-      const token = await createItemExpectSuccess(alice, newCollectionID, 'NFT');
+      const newCollectionID = await createCollectionWithPropsExpectSuccess();
       await addCollectionAdminExpectSuccess(alice, newCollectionID, bob.address);
-      
-      await expect(executeTransaction(
-        api, 
-        bob, 
-        api.tx.unique.setTokenProperties(newCollectionID, token, [{key: 'key1', value: 'v2'}]), 
-      )).to.be.rejected;
+
+      await createItemWithPropsExpectFailure(bob, newCollectionID, 'NFT', [{key: 'k', value: 'v'}]);
     });
   });
 
   it('Adding more than 64 prps', async () => {
     await usingApi(async api => {
-      const createMode = 'NFT';
-
       const prps = [];
 
       for (let i = 0; i < 65; i++) {
         prps.push({key: `key${i}`, value: `value${i}`});
       }
 
-      const newCollectionID = await createCollectionExpectSuccess({mode: {type: createMode}});
+      const newCollectionID = await createCollectionWithPropsExpectSuccess();
       
-      await expect(executeTransaction(api, alice, api.tx.unique.setCollectionProperties(newCollectionID, prps))).to.be.rejectedWith(/common\.PropertyLimitReached/);
+      createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', prps);
     });
   });
 
   it('Trying to add bigger property than allowed', async () => {
     await usingApi(async api => {
-      const createMode = 'NFT';
-      const newCollectionID = await createCollectionExpectSuccess({mode: {type: createMode}});
+      const newCollectionID = await createCollectionWithPropsExpectSuccess();
       
-      await expect(executeTransaction(api, alice, api.tx.unique.setCollectionProperties(newCollectionID, [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]))).to.be.rejectedWith(/common\.NoSpaceForProperty/);
+      createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]);
     });
   });
 });
modifiedtests/src/createMultipleItems.test.tsdiffbeforeafterboth
--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -34,7 +34,8 @@
   getCreatedCollectionCount,
   createCollectionWithPropsExpectSuccess,
   getCreateItemsResult,
-  createMultipleItemsWithPropsExpectSuccess
+  createMultipleItemsWithPropsExpectSuccess,
+  createMultipleItemsWithPropsExpectFailure,
 } from './util/helpers';
 
 chai.use(chaiAsPromised);
@@ -432,79 +433,44 @@
   it('No editing rights', async () => {
     await usingApi(async (api: ApiPromise) => {
       const collectionId = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}],
-        propPerm:   [{key: 'key1', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}]});
+        propPerm:   [{key: 'key1', permission: {mutable: false, collectionAdmin: false, tokenOwner: true}}]});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
       await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
-      const args = [{Nft: {const_data: '0x31'}},
+      const args = [{Nft: {const_data: '0x31', properties: [{key: 'key1', value: 'v2'}]}},
         {Nft: {const_data: '0x32'}},
         {Nft: {const_data: '0x33'}}];
 
-      const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);
-
-      const events = await submitTransactionAsync(alice, createMultipleItemsTx);
-      const result = getCreateItemsResult(events);
-
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, [{key: 'key1', value: 'v2'}]),
-        )).to.be.rejected;
-      }
-
-      // await expect(submitTransactionAsync(bob, createMultipleItemsTx)).to.be.rejected;
+      await createMultipleItemsWithPropsExpectFailure(bob, collectionId, args);
     });
   });
 
   it('User doesnt have editing rights', async () => {
     await usingApi(async (api: ApiPromise) => {
       const collectionId = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}],
-        propPerm:   [{key: 'key1', permission: {mutable: false, collectionAdmin: false, tokenOwner: false}}]});
+        propPerm:   [{key: 'key1', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}]});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
       await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
-      const args = [{Nft: {const_data: '0x31'}},
+      const args = [{Nft: {const_data: '0x31', properties: [{key: 'key1', value: 'v2'}]}},
         {Nft: {const_data: '0x32'}},
         {Nft: {const_data: '0x33'}}];
 
-      const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);
-
-      const events = await submitTransactionAsync(alice, createMultipleItemsTx);
-      const result = getCreateItemsResult(events);
-
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, [{key: 'key1', value: 'v2'}]),
-        )).to.be.rejected;
-      }
+      await createMultipleItemsWithPropsExpectFailure(bob, collectionId, args);
     });
   });
 
   it('Adding property without access rights', async () => {
     await usingApi(async (api: ApiPromise) => {
-      const collectionId = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}]});
+      const collectionId = await createCollectionWithPropsExpectSuccess({properties: [{key: 'k', value: 'v1'}]});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
       expect(itemsListIndexBefore).to.be.equal(0);
-      const args = [{Nft: {const_data: '0x31'}},
+      const args = [{Nft: {const_data: '0x31', properties: [{key: 'k', value: 'v'}]}},
         {Nft: {const_data: '0x32'}},
         {Nft: {const_data: '0x33'}}];
 
-      const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);
-
-      const events = await submitTransactionAsync(alice, createMultipleItemsTx);
-      const result = getCreateItemsResult(events);
-
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, [{key: 'key1', value: 'v2'}]),
-        )).to.be.rejected;
-      }
+      await createMultipleItemsWithPropsExpectFailure(bob, collectionId, args);
     });
   });
 
@@ -515,15 +481,6 @@
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
       await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
-
-      const args = [{Nft: {const_data: '0x31'}},
-        {Nft: {const_data: '0x32'}},
-        {Nft: {const_data: '0x33'}}];
-
-      const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);
-      const events = await submitTransactionAsync(alice, createMultipleItemsTx);
-
-      const result = getCreateItemsResult(events);
 
       const prps = [];
 
@@ -531,43 +488,24 @@
         prps.push({key: `key${i}`, value: `value${i}`});
       }
 
-      await expect(executeTransaction(api, bob, api.tx.unique.setCollectionProperties(collectionId, prps))).to.be.rejectedWith(/common\.PropertyLimitReached/);
+      const args = [{Nft: {const_data: '0x31', properties: prps}},
+        {Nft: {const_data: '0x32', properties: prps}},
+        {Nft: {const_data: '0x33', properties: prps}}];
 
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, prps),
-        )).to.be.rejected;
-      }
+      createMultipleItemsWithPropsExpectFailure(alice, collectionId, args);
     });
   });
 
   it('Trying to add bigger property than allowed', async () => {
     await usingApi(async (api: ApiPromise) => {
-      const collectionId = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}],
-        propPerm:   [{key: 'key1', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}]});
+      const collectionId = await createCollectionWithPropsExpectSuccess({propPerm:   [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
-      const args = [{Nft: {const_data: '0x31'}},
-        {Nft: {const_data: '0x32'}},
-        {Nft: {const_data: '0x33'}}];
-
-      const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);
-
-      const events = await submitTransactionAsync(alice, createMultipleItemsTx);
-      const result = getCreateItemsResult(events);
-
-
-      await expect(executeTransaction(api, alice, api.tx.unique.setCollectionProperties(collectionId, [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]))).to.be.rejectedWith(/common\.NoSpaceForProperty/);
+      const args = [{Nft: {const_data: '0x31', properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]}},
+        {Nft: {const_data: '0x32', properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]}},
+        {Nft: {const_data: '0x33', properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]}}];
 
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]),
-        )).to.be.rejected;
-      }
+      createMultipleItemsWithPropsExpectFailure(alice, collectionId, args);
     });
   });
 });
modifiedtests/src/createMultipleItemsEx.test.tsdiffbeforeafterboth
--- a/tests/src/createMultipleItemsEx.test.ts
+++ b/tests/src/createMultipleItemsEx.test.ts
@@ -16,7 +16,7 @@
 
 import {expect} from 'chai';
 import privateKey from './substrate/privateKey';
-import usingApi, {executeTransaction, submitTransactionAsync} from './substrate/substrate-api';
+import usingApi, {executeTransaction, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';
 import {createCollectionExpectSuccess, createCollectionWithPropsExpectSuccess, addCollectionAdminExpectSuccess, getCreateItemsResult} from './util/helpers';
 
 describe('createMultipleItemsEx', () => {
@@ -48,7 +48,7 @@
     });
   });
 
-  it.only('createMultipleItemsEx with property Admin', async () => {
+  it('createMultipleItemsEx with property Admin', async () => {
     const collection = await createCollectionWithPropsExpectSuccess({mode: {type: 'NFT'}, propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: false}}]});
     const alice = privateKey('//Alice');
     const bob = privateKey('//Bob');
@@ -152,26 +152,20 @@
       const data = [
         {
           owner: {substrate: alice.address},
+          properties: [{key: 'key1', value: 'v2'}],
         }, {
-          owner: {substrate: bob.address},
+          owner: {substrate: alice.address},
+          properties: [{key: 'key1', value: 'v2'}],
         }, {
-          owner: {substrate: charlie.address},
+          owner: {substrate: alice.address},
+          properties: [{key: 'key1', value: 'v2'}],
         },
       ];
 
       const tx = api.tx.unique.createMultipleItemsEx(collection, {NFT: data});
-      await executeTransaction(api, alice, tx);
-
-      const events = await submitTransactionAsync(alice, tx);
-      const result = getCreateItemsResult(events);
+      // await executeTransaction(api, alice, tx);
 
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, [{key: 'key1', value: 'v2'}]),
-        )).to.be.rejected;
-      }
+      await submitTransactionExpectFailAsync(alice, tx);
     });
   });
 
@@ -186,26 +180,20 @@
       const data = [
         {
           owner: {substrate: alice.address},
+          properties: [{key: 'key1', value: 'v2'}],
         }, {
-          owner: {substrate: bob.address},
+          owner: {substrate: alice.address},
+          properties: [{key: 'key1', value: 'v2'}],
         }, {
-          owner: {substrate: charlie.address},
+          owner: {substrate: alice.address},
+          properties: [{key: 'key1', value: 'v2'}],
         },
       ];
 
       const tx = api.tx.unique.createMultipleItemsEx(collection, {NFT: data});
-      await executeTransaction(api, alice, tx);
-
-      const events = await submitTransactionAsync(alice, tx);
-      const result = getCreateItemsResult(events);
+      // await executeTransaction(api, alice, tx);
 
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, [{key: 'key1', value: 'v2'}]),
-        )).to.be.rejected;
-      }
+      await submitTransactionExpectFailAsync(alice, tx);
     });
   });
 
@@ -219,31 +207,32 @@
       const data = [
         {
           owner: {substrate: alice.address},
+          properties: [{key: 'key1', value: 'v2'}],
         }, {
           owner: {substrate: bob.address},
+          properties: [{key: 'key1', value: 'v2'}],
         }, {
           owner: {substrate: charlie.address},
+          properties: [{key: 'key1', value: 'v2'}],
         },
       ];
 
       const tx = api.tx.unique.createMultipleItemsEx(collection, {NFT: data});
-      await executeTransaction(api, alice, tx);
-
-      const events = await submitTransactionAsync(alice, tx);
-      const result = getCreateItemsResult(events);
 
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, [{key: 'key1', value: 'v2'}]),
-        )).to.be.rejected;
-      }
+      await submitTransactionExpectFailAsync(alice, tx);
     });
   });
 
   it('Adding more than 64 prps', async () => {
-    const collection = await createCollectionWithPropsExpectSuccess();
+    const prps = [{key: 'key', value: 'v'}];
+    const propPerm = [{key: 'key', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}];
+
+    for (let i = 0; i < 65; i++) {
+      prps.push({key: `key${i}`, value: `value${i}`});
+      propPerm.push({key: `key${i}`, permission: {mutable: true, collectionAdmin: true, tokenOwner: true}});
+    }
+
+    const collection = await createCollectionWithPropsExpectSuccess({propPerm: propPerm});
     const alice = privateKey('//Alice');
     const bob = privateKey('//Bob');
     const charlie = privateKey('//Charlie');
@@ -252,40 +241,24 @@
       const data = [
         {
           owner: {substrate: alice.address},
+          properties: prps,
         }, {
-          owner: {substrate: bob.address},
+          owner: {substrate: alice.address},
+          properties: prps,
         }, {
-          owner: {substrate: charlie.address},
+          owner: {substrate: alice.address},
+          properties: prps,
         },
       ];
 
       const tx = api.tx.unique.createMultipleItemsEx(collection, {NFT: data});
-      await executeTransaction(api, alice, tx);
 
-      const events = await submitTransactionAsync(alice, tx);
-      const result = getCreateItemsResult(events);
-
-      const prps = [];
-
-      for (let i = 0; i < 65; i++) {
-        prps.push({key: `key${i}`, value: `value${i}`});
-      }
-
-      await expect(executeTransaction(api, bob, api.tx.unique.setCollectionProperties(collection, prps))).to.be.rejectedWith(/common\.PropertyLimitReached/);
-
-
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, prps),
-        )).to.be.rejected;
-      }
+      await submitTransactionExpectFailAsync(alice, tx);
     });
   });
 
   it('Trying to add bigger property than allowed', async () => {
-    const collection = await createCollectionWithPropsExpectSuccess();
+    const collection = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});
     const alice = privateKey('//Alice');
     const bob = privateKey('//Bob');
     const charlie = privateKey('//Charlie');
@@ -293,32 +266,17 @@
     await usingApi(async (api) => {
       const data = [
         {
-          owner: {substrate: alice.address},
+          owner: {substrate: alice.address}, properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}],
         }, {
-          owner: {substrate: bob.address},
+          owner: {substrate: bob.address}, properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}],
         }, {
-          owner: {substrate: charlie.address},
+          owner: {substrate: charlie.address}, properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}],
         },
       ];
 
       const tx = api.tx.unique.createMultipleItemsEx(collection, {NFT: data});
-      await executeTransaction(api, alice, tx);
 
-      const events = await submitTransactionAsync(alice, tx);
-      const result = getCreateItemsResult(events);
-
-      const prps = [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}];
-
-      await expect(executeTransaction(api, bob, api.tx.unique.setCollectionProperties(collection, prps))).to.be.rejectedWith(/common\.NoSpaceForProperty/);
-
-
-      for (const elem of result) {
-        await expect(executeTransaction(
-          api,
-          bob,
-          api.tx.unique.setTokenProperties(elem.collectionId, elem.itemId, prps),
-        )).to.be.rejected;
-      }
+      await submitTransactionExpectFailAsync(alice, tx);
     });
   });
 
modifiedtests/src/interfaces/rmrk/definitions.tsdiffbeforeafterboth
--- a/tests/src/interfaces/rmrk/definitions.ts
+++ b/tests/src/interfaces/rmrk/definitions.ts
@@ -24,92 +24,92 @@
 
 const atParam = {name: 'at', type: 'Hash', isOptional: true};
 const fn = (description: string, params: RpcParam[], type: string) => ({
-    description,
-    params: [...params, atParam],
-    type,
+  description,
+  params: [...params, atParam],
+  type,
 });
 
 export default {
-    types,
-    rpc: {
-        lastCollectionIdx: fn('Get the latest created collection id', [], 'u32'),
-        collectionById: fn('Get collection by id', [{name: 'id', type: 'u32'}], 'Option<RmrkTypesCollectionInfo>'),
-        nftById: fn(
-            'Get NFT by collection id and NFT id',
-            [
-                {name: 'collectionId', type: 'u32'},
-                {name: 'nftId', type: 'u32'},
-            ],
-            'Option<RmrkTypesNftInfo>'
-        ),
-        accountTokens: fn(
-            'Get tokens owned by an account in a collection',
-            [
-                {name: 'accountId', type: 'AccountId32'},
-                {name: 'collectionId', type: 'u32'}
-            ],
-            'Vec<u32>'
-        ),
-        nftChildren: fn(
-            'Get NFT children',
-            [
-                {name: 'collectionId', type: 'u32'},
-                {name: 'nftId', type: 'u32'},
-            ],
-            'Vec<RmrkTypesNftChild>'
-        ),
-        collectionProperties: fn(
-            'Get collection properties',
-            [{name: 'collectionId', type: 'u32'}],
-            'Vec<RmrkTypesPropertyInfo>'
-        ),
-        nftProperties: fn(
-            'Get NFT properties',
-            [
-                {name: 'collectionId', type: 'u32'},
-                {name: 'nftId', type: 'u32'}
-            ],
-            'Vec<RmrkTypesPropertyInfo>'
-        ),
-        nftResources: fn(
-            'Get NFT resources',
-            [
-                {name: 'collectionId', type: 'u32'},
-                {name: 'nftId', type: 'u32'}
-            ],
-            'Vec<RmrkTypesResourceInfo>'
-        ),
-        nftResourcePriorities: fn(
-            'Get NFT resource priorities',
-            [
-                {name: 'collectionId', type: 'u32'},
-                {name: 'nftId', type: 'u32'}
-            ],
-            'Vec<Bytes>'
-        ),
-        base: fn(
-            'Get base info',
-            [{name: 'baseId', type: 'u32'}],
-            'Option<RmrkTypesBaseInfo>'
-        ),
-        baseParts: fn(
-            'Get all Base\'s parts',
-            [{name: 'baseId', type: 'u32'}],
-            'Vec<RmrkTypesPartType>'
-        ),
-        themeNames: fn(
-            'Get Base\'s theme names',
-            [{name: 'baseId', type: 'u32'}],
-            'Vec<Bytes>'
-        ),
-        themes: fn(
-            'Get Theme\'s keys values',
-            [
-                {name: 'baseId', type: 'u32'},
-                {name: 'themeName', type: 'String'},
-                {name: 'keys', type: 'Option<Vec<String>>'}
-            ],
-            'Option<RmrkTypesTheme>'
-        )
-    }
+  types,
+  rpc: {
+    lastCollectionIdx: fn('Get the latest created collection id', [], 'u32'),
+    collectionById: fn('Get collection by id', [{name: 'id', type: 'u32'}], 'Option<RmrkTypesCollectionInfo>'),
+    nftById: fn(
+      'Get NFT by collection id and NFT id',
+      [
+        {name: 'collectionId', type: 'u32'},
+        {name: 'nftId', type: 'u32'},
+      ],
+      'Option<RmrkTypesNftInfo>',
+    ),
+    accountTokens: fn(
+      'Get tokens owned by an account in a collection',
+      [
+        {name: 'accountId', type: 'AccountId32'},
+        {name: 'collectionId', type: 'u32'},
+      ],
+      'Vec<u32>',
+    ),
+    nftChildren: fn(
+      'Get NFT children',
+      [
+        {name: 'collectionId', type: 'u32'},
+        {name: 'nftId', type: 'u32'},
+      ],
+      'Vec<RmrkTypesNftChild>',
+    ),
+    collectionProperties: fn(
+      'Get collection properties',
+      [{name: 'collectionId', type: 'u32'}],
+      'Vec<RmrkTypesPropertyInfo>',
+    ),
+    nftProperties: fn(
+      'Get NFT properties',
+      [
+        {name: 'collectionId', type: 'u32'},
+        {name: 'nftId', type: 'u32'},
+      ],
+      'Vec<RmrkTypesPropertyInfo>',
+    ),
+    nftResources: fn(
+      'Get NFT resources',
+      [
+        {name: 'collectionId', type: 'u32'},
+        {name: 'nftId', type: 'u32'},
+      ],
+      'Vec<RmrkTypesResourceInfo>',
+    ),
+    nftResourcePriorities: fn(
+      'Get NFT resource priorities',
+      [
+        {name: 'collectionId', type: 'u32'},
+        {name: 'nftId', type: 'u32'},
+      ],
+      'Vec<Bytes>',
+    ),
+    base: fn(
+      'Get base info',
+      [{name: 'baseId', type: 'u32'}],
+      'Option<RmrkTypesBaseInfo>',
+    ),
+    baseParts: fn(
+      'Get all Base\'s parts',
+      [{name: 'baseId', type: 'u32'}],
+      'Vec<RmrkTypesPartType>',
+    ),
+    themeNames: fn(
+      'Get Base\'s theme names',
+      [{name: 'baseId', type: 'u32'}],
+      'Vec<Bytes>',
+    ),
+    themes: fn(
+      'Get Theme\'s keys values',
+      [
+        {name: 'baseId', type: 'u32'},
+        {name: 'themeName', type: 'String'},
+        {name: 'keys', type: 'Option<Vec<String>>'},
+      ],
+      'Option<RmrkTypesTheme>',
+    ),
+  },
 };
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
1135 const events = await submitTransactionAsync(sender, tx);1135 const events = await submitTransactionAsync(sender, tx);
1136 const result = getCreateItemsResult(events);1136 const result = getCreateItemsResult(events);
11371137
1138 for (let res of result) {1138 for (const res of result) {
1139 expect(await api.rpc.unique.tokenProperties(collectionId, res.itemId)).not.to.be.empty;1139 expect(await api.rpc.unique.tokenProperties(collectionId, res.itemId)).not.to.be.empty;
1140 }1140 }
1141 });1141 });
1142}1142}
1143
1144export async function createMultipleItemsWithPropsExpectFailure(sender: IKeyringPair, collectionId: number, itemsData: any, owner: CrossAccountId | string = sender.address) {
1145 await usingApi(async (api) => {
1146 const to = normalizeAccountId(owner);
1147 const tx = api.tx.unique.createMultipleItems(collectionId, to, itemsData);
1148
1149 const events = await expect(await submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
1150 const result = getCreateItemsResult(events);
1151
1152 expect(result).to.be.equal(false);
1153 });
1154}
1155
1156export async function createMultipleItemsExWithPropsExpectSuccess(sender: IKeyringPair, collectionId: number, itemsData: any) {
1157 await usingApi(async (api) => {
1158 const tx = api.tx.unique.createMultipleItemsEx(collectionId, itemsData);
1159
1160 const events = await submitTransactionAsync(sender, tx);
1161 const result = getCreateItemsResult(events);
1162
1163 for (const res of result) {
1164 expect(await api.rpc.unique.tokenProperties(collectionId, res.itemId)).not.to.be.empty;
1165 }
1166 });
1167}
11431168
1144export async function createItemWithPropsExpectSuccess(sender: IKeyringPair, collectionId: number, createMode: string, props: Array<Property>, owner: CrossAccountId | string = sender.address) {1169export async function createItemWithPropsExpectSuccess(sender: IKeyringPair, collectionId: number, createMode: string, props: Array<Property>, owner: CrossAccountId | string = sender.address) {
1145 let newItemId = 0;1170 let newItemId = 0;
1186 return newItemId;1211 return newItemId;
1187}1212}
1213
1214export async function createItemWithPropsExpectFailure(sender: IKeyringPair, collectionId: number, createMode: string, props: Array<Property>, owner: CrossAccountId | string = sender.address) {
1215 await usingApi(async (api) => {
1216
1217 let tx;
1218 if (createMode === 'NFT') {
1219 const data = api.createType('UpDataStructsCreateItemData', {NFT: {constData: 'test', properties: props}});
1220 tx = api.tx.unique.createItem(collectionId, normalizeAccountId(owner), data);
1221 } else {
1222 tx = api.tx.unique.createItem(collectionId, normalizeAccountId(owner), createMode);
1223 }
1224
1225
1226 const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
1227 const result = getCreateItemResult(events);
1228
1229 expect(result.success).to.be.false;
1230 });
1231}
11881232
1189export async function createItemExpectSuccess(sender: IKeyringPair, collectionId: number, createMode: string, owner: CrossAccountId | string = sender.address) {1233export async function createItemExpectSuccess(sender: IKeyringPair, collectionId: number, createMode: string, owner: CrossAccountId | string = sender.address) {
1190 let newItemId = 0;1234 let newItemId = 0;