git.delta.rocks / unique-network / refs/commits / 55c7c972e8a3

difftreelog

Fix after review

Max Andreev2022-10-04parent: #f6544e6.patch.diff
in: master
Accounts moved inside describe

4 files changed

modifiedtests/src/burnItem.test.tsdiffbeforeafterboth
--- a/tests/src/burnItem.test.ts
+++ b/tests/src/burnItem.test.ts
@@ -17,11 +17,12 @@
 import {IKeyringPair} from '@polkadot/types/types';
 import {expect, itSub, Pallets, usingPlaygrounds} from './util/playgrounds';
 
-let donor: IKeyringPair;
-let alice: IKeyringPair;
-let bob: IKeyringPair;
 
 describe('integration test: ext. burnItem():', () => {
+  let donor: IKeyringPair;
+  let alice: IKeyringPair;
+  let bob: IKeyringPair;
+
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       donor = privateKey('//Alice');
@@ -34,7 +35,7 @@
     const token = await collection.mintToken(alice);
 
     await token.burn(alice);
-    expect(await token.isExist()).to.be.false;
+    expect(await token.doesExist()).to.be.false;
   });
 
   itSub('Burn item in Fungible collection', async ({helper}) => {
@@ -73,6 +74,10 @@
 });
 
 describe('integration test: ext. burnItem() with admin permissions:', () => {
+  let donor: IKeyringPair;
+  let alice: IKeyringPair;
+  let bob: IKeyringPair;
+
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       donor = privateKey('//Alice');
@@ -87,7 +92,7 @@
     const token = await collection.mintToken(alice);
 
     await token.burnFrom(bob, {Substrate: alice.address});
-    expect(await token.isExist()).to.be.false;
+    expect(await token.doesExist()).to.be.false;
   });
 
   itSub('Burn item in Fungible collection', async ({helper}) => {
@@ -107,11 +112,15 @@
     const token = await collection.mintToken(alice, 100n);
 
     await token.burnFrom(bob, {Substrate: alice.address}, 100n);
-    expect(await token.isExist()).to.be.false;
+    expect(await token.doesExist()).to.be.false;
   });
 });
 
 describe('Negative integration test: ext. burnItem():', () => {
+  let donor: IKeyringPair;
+  let alice: IKeyringPair;
+  let bob: IKeyringPair;
+
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       donor = privateKey('//Alice');
modifiedtests/src/fungible.test.tsdiffbeforeafterboth
before · tests/src/fungible.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {IKeyringPair} from '@polkadot/types/types';18import {itSub, usingPlaygrounds, expect} from './util/playgrounds';1920const U128_MAX = (1n << 128n) - 1n;2122describe('integration test: Fungible functionality:', () => {23  let alice: IKeyringPair;24  let bob: IKeyringPair;2526  before(async () => {27    await usingPlaygrounds(async (helper, privateKey) => {28      const donor = privateKey('//Alice');29      [alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);30    });31  });3233  itSub('Create fungible collection and token', async ({helper}) => {34    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'trest'});35    const defaultTokenId = await collection.getLastTokenId();36    expect(defaultTokenId).to.be.equal(0);3738    await collection.mint(alice, U128_MAX);39    const aliceBalance = await collection.getBalance({Substrate: alice.address});40    const itemCountAfter = await collection.getLastTokenId();4142    expect(itemCountAfter).to.be.equal(defaultTokenId);43    expect(aliceBalance).to.be.equal(U128_MAX);44  });45  46  itSub('RPC method tokenOnewrs for fungible collection and token', async ({helper, privateKey}) => {47    const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};48    const facelessCrowd = Array(7).fill(0).map((_, i) => ({Substrate: privateKey(`//Alice+${i}`).address}));4950    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});5152    await collection.mint(alice, U128_MAX);5354    await collection.transfer(alice, {Substrate: bob.address}, 1000n);55    await collection.transfer(alice, ethAcc, 900n);56    57    for (let i = 0; i < 7; i++) {58      await collection.transfer(alice, facelessCrowd[i], 1n);59    } 6061    const owners = await collection.getTop10Owners();6263    // What to expect64    expect(owners).to.deep.include.members([{Substrate: alice.address}, ethAcc, {Substrate: bob.address}, ...facelessCrowd]);65    expect(owners.length).to.be.equal(10);66    67    const eleven = privateKey('//ALice+11');68    expect(await collection.transfer(alice, {Substrate: eleven.address}, 10n)).to.be.true;69    expect((await collection.getTop10Owners()).length).to.be.equal(10);70  });71  72  itSub('Transfer token', async ({helper}) => {73    const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};74    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});75    await collection.mint(alice, 500n);7677    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(500n);78    expect(await collection.transfer(alice, {Substrate: bob.address}, 60n)).to.be.true;79    expect(await collection.transfer(alice, ethAcc, 140n)).to.be.true;8081    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(300n);82    expect(await collection.getBalance({Substrate: bob.address})).to.be.equal(60n);83    expect(await collection.getBalance(ethAcc)).to.be.equal(140n);8485    await expect(collection.transfer(alice, {Substrate: bob.address}, 350n)).to.eventually.be.rejectedWith(/common\.TokenValueTooLow/);86  });8788  itSub('Tokens multiple creation', async ({helper}) => {89    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});9091    await collection.mintWithOneOwner(alice, [92      {value: 500n},93      {value: 400n},94      {value: 300n},95    ]);9697    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(1200n);98  });99100  itSub('Burn some tokens ', async ({helper}) => {101    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});102    await collection.mint(alice, 500n);103104    expect(await collection.isTokenExists(0)).to.be.true;105    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(500n);106    expect(await collection.burnTokens(alice, 499n)).to.be.true;107    expect(await collection.isTokenExists(0)).to.be.true;108    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(1n);109  });110  111  itSub('Burn all tokens ', async ({helper}) => {112    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});113    await collection.mint(alice, 500n);114115    expect(await collection.isTokenExists(0)).to.be.true;116    expect(await collection.burnTokens(alice, 500n)).to.be.true;117    expect(await collection.isTokenExists(0)).to.be.true;118119    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(0n);120    expect(await collection.getTotalPieces()).to.be.equal(0n);121  });122123  itSub('Set allowance for token', async ({helper}) => {124    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});125    const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};126    await collection.mint(alice, 100n);127128    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(100n);129    130    expect(await collection.approveTokens(alice, {Substrate: bob.address}, 60n)).to.be.true;131    expect(await collection.getApprovedTokens({Substrate: alice.address}, {Substrate: bob.address})).to.be.equal(60n);132    expect(await collection.getBalance({Substrate: bob.address})).to.be.equal(0n);133134    expect(await collection.transferFrom(bob, {Substrate: alice.address}, {Substrate: bob.address}, 20n)).to.be.true;135    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(80n);136    expect(await collection.getBalance({Substrate: bob.address})).to.be.equal(20n);137    expect(await collection.getApprovedTokens({Substrate: alice.address}, {Substrate: bob.address})).to.be.equal(40n);138139    await collection.burnTokensFrom(bob, {Substrate: alice.address}, 10n);140141    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(70n);142    expect(await collection.getApprovedTokens({Substrate: alice.address}, {Substrate: bob.address})).to.be.equal(30n);143    expect(await collection.transferFrom(bob, {Substrate: alice.address}, ethAcc, 10n)).to.be.true;144    expect(await collection.getBalance(ethAcc)).to.be.equal(10n);145  });146});
after · tests/src/fungible.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {IKeyringPair} from '@polkadot/types/types';18import {itSub, usingPlaygrounds, expect} from './util/playgrounds';1920const U128_MAX = (1n << 128n) - 1n;2122describe('integration test: Fungible functionality:', () => {23  let alice: IKeyringPair;24  let bob: IKeyringPair;2526  before(async () => {27    await usingPlaygrounds(async (helper, privateKey) => {28      const donor = privateKey('//Alice');29      [alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);30    });31  });3233  itSub('Create fungible collection and token', async ({helper}) => {34    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'trest'});35    const defaultTokenId = await collection.getLastTokenId();36    expect(defaultTokenId).to.be.equal(0);3738    await collection.mint(alice, U128_MAX);39    const aliceBalance = await collection.getBalance({Substrate: alice.address});40    const itemCountAfter = await collection.getLastTokenId();4142    expect(itemCountAfter).to.be.equal(defaultTokenId);43    expect(aliceBalance).to.be.equal(U128_MAX);44  });45  46  itSub('RPC method tokenOnewrs for fungible collection and token', async ({helper, privateKey}) => {47    const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};48    const facelessCrowd = Array(7).fill(0).map((_, i) => ({Substrate: privateKey(`//Alice+${i}`).address}));4950    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});5152    await collection.mint(alice, U128_MAX);5354    await collection.transfer(alice, {Substrate: bob.address}, 1000n);55    await collection.transfer(alice, ethAcc, 900n);56    57    for (let i = 0; i < 7; i++) {58      await collection.transfer(alice, facelessCrowd[i], 1n);59    } 6061    const owners = await collection.getTop10Owners();6263    // What to expect64    expect(owners).to.deep.include.members([{Substrate: alice.address}, ethAcc, {Substrate: bob.address}, ...facelessCrowd]);65    expect(owners.length).to.be.equal(10);66    67    const eleven = privateKey('//ALice+11');68    expect(await collection.transfer(alice, {Substrate: eleven.address}, 10n)).to.be.true;69    expect((await collection.getTop10Owners()).length).to.be.equal(10);70  });71  72  itSub('Transfer token', async ({helper}) => {73    const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};74    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});75    await collection.mint(alice, 500n);7677    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(500n);78    expect(await collection.transfer(alice, {Substrate: bob.address}, 60n)).to.be.true;79    expect(await collection.transfer(alice, ethAcc, 140n)).to.be.true;8081    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(300n);82    expect(await collection.getBalance({Substrate: bob.address})).to.be.equal(60n);83    expect(await collection.getBalance(ethAcc)).to.be.equal(140n);8485    await expect(collection.transfer(alice, {Substrate: bob.address}, 350n)).to.eventually.be.rejectedWith(/common\.TokenValueTooLow/);86  });8788  itSub('Tokens multiple creation', async ({helper}) => {89    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});9091    await collection.mintWithOneOwner(alice, [92      {value: 500n},93      {value: 400n},94      {value: 300n},95    ]);9697    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(1200n);98  });99100  itSub('Burn some tokens ', async ({helper}) => {101    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});102    await collection.mint(alice, 500n);103104    expect(await collection.doesTokenExist(0)).to.be.true;105    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(500n);106    expect(await collection.burnTokens(alice, 499n)).to.be.true;107    expect(await collection.doesTokenExist(0)).to.be.true;108    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(1n);109  });110  111  itSub('Burn all tokens ', async ({helper}) => {112    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});113    await collection.mint(alice, 500n);114115    expect(await collection.doesTokenExist(0)).to.be.true;116    expect(await collection.burnTokens(alice, 500n)).to.be.true;117    expect(await collection.doesTokenExist(0)).to.be.true;118119    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(0n);120    expect(await collection.getTotalPieces()).to.be.equal(0n);121  });122123  itSub('Set allowance for token', async ({helper}) => {124    const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});125    const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};126    await collection.mint(alice, 100n);127128    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(100n);129    130    expect(await collection.approveTokens(alice, {Substrate: bob.address}, 60n)).to.be.true;131    expect(await collection.getApprovedTokens({Substrate: alice.address}, {Substrate: bob.address})).to.be.equal(60n);132    expect(await collection.getBalance({Substrate: bob.address})).to.be.equal(0n);133134    expect(await collection.transferFrom(bob, {Substrate: alice.address}, {Substrate: bob.address}, 20n)).to.be.true;135    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(80n);136    expect(await collection.getBalance({Substrate: bob.address})).to.be.equal(20n);137    expect(await collection.getApprovedTokens({Substrate: alice.address}, {Substrate: bob.address})).to.be.equal(40n);138139    await collection.burnTokensFrom(bob, {Substrate: alice.address}, 10n);140141    expect(await collection.getBalance({Substrate: alice.address})).to.be.equal(70n);142    expect(await collection.getApprovedTokens({Substrate: alice.address}, {Substrate: bob.address})).to.be.equal(30n);143    expect(await collection.transferFrom(bob, {Substrate: alice.address}, ethAcc, 10n)).to.be.true;144    expect(await collection.getBalance(ethAcc)).to.be.equal(10n);145  });146});
modifiedtests/src/refungible.test.tsdiffbeforeafterboth
--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -122,10 +122,10 @@
   itSub('Burn some pieces', async ({helper}) => {
     const collection = await helper.rft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
     const token = await collection.mintToken(alice, 100n);
-    expect(await collection.isTokenExists(token.tokenId)).to.be.true;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(100n);
     expect(await token.burn(alice, 99n)).to.be.true;
-    expect(await collection.isTokenExists(token.tokenId)).to.be.true;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(1n);
   });
 
@@ -133,18 +133,18 @@
     const collection = await helper.rft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
     const token = await collection.mintToken(alice, 100n);
     
-    expect(await collection.isTokenExists(token.tokenId)).to.be.true;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(100n);
 
     expect(await token.burn(alice, 100n)).to.be.true;
-    expect(await collection.isTokenExists(token.tokenId)).to.be.false;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.false;
   });
 
   itSub('Burn some pieces for multiple users', async ({helper}) => {
     const collection = await helper.rft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
     const token = await collection.mintToken(alice, 100n);
 
-    expect(await collection.isTokenExists(token.tokenId)).to.be.true;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.true;
     
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(100n);
     expect(await token.transfer(alice, {Substrate: bob.address}, 60n)).to.be.true;
@@ -154,17 +154,17 @@
 
     expect(await token.burn(alice, 40n)).to.be.true;
 
-    expect(await collection.isTokenExists(token.tokenId)).to.be.true;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(0n);
 
     expect(await token.burn(bob, 59n)).to.be.true;
 
     expect(await token.getBalance({Substrate: bob.address})).to.be.equal(1n);
-    expect(await collection.isTokenExists(token.tokenId)).to.be.true;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.true;
 
     expect(await token.burn(bob, 1n)).to.be.true;
 
-    expect(await collection.isTokenExists(token.tokenId)).to.be.false;
+    expect(await collection.doesTokenExist(token.tokenId)).to.be.false;
   });
 
   itSub('Set allowance for token', async ({helper}) => {
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -1114,10 +1114,10 @@
    *
    * @param collectionId ID of collection
    * @param tokenId ID of token
-   * @example isTokenExists(10, 20);
+   * @example doesTokenExist(10, 20);
    * @returns true if the token exists, otherwise false
    */
-  async isTokenExists(collectionId: number, tokenId: number): Promise<boolean> {
+  async doesTokenExist(collectionId: number, tokenId: number): Promise<boolean> {
     return (await this.helper.callRpc('api.rpc.unique.tokenExists', [collectionId, tokenId])).toJSON();
   }
 }
@@ -2277,8 +2277,8 @@
     return await this.helper.collection.getLastTokenId(this.collectionId);
   }
 
-  async isTokenExists(tokenId: number) {
-    return await this.helper.collection.isTokenExists(this.collectionId, tokenId);
+  async doesTokenExist(tokenId: number) {
+    return await this.helper.collection.doesTokenExist(this.collectionId, tokenId);
   }
 
   async getAdmins() {
@@ -2607,8 +2607,8 @@
     return await this.collection.deleteTokenProperties(signer, this.tokenId, propertyKeys);
   }
 
-  async isExist() {
-    return await this.collection.isTokenExists(this.tokenId);
+  async doesExist() {
+    return await this.collection.doesTokenExist(this.tokenId);
   }
 
   nestingAccount() {