git.delta.rocks / unique-network / refs/commits / dbce17d9b0b2

difftreelog

test(eth) fix linting errors and warnings

Fahrrader2022-09-05parent: #e6b5df4.patch.diff
in: master

8 files changed

modifiedtests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -15,7 +15,7 @@
 
 import {expect} from 'chai';
 import privateKey from '../substrate/privateKey';
-import { UNIQUE } from '../util/helpers';
+import {UNIQUE} from '../util/helpers';
 import {
   createEthAccount,
   createEthAccountWithBalance, 
@@ -24,7 +24,6 @@
   getCollectionAddressFromResult, 
   itWeb3,
   recordEthFee,
-  subToEth,
 } from './util/helpers';
 
 describe('Add collection admins', () => {
@@ -37,7 +36,7 @@
       .send();
     const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
 
-    const newAdmin = await createEthAccount(web3);
+    const newAdmin = createEthAccount(web3);
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
     const adminList = await api.rpc.unique.adminlist(collectionId);
@@ -92,7 +91,7 @@
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     await collectionEvm.methods.addCollectionAdmin(admin).send();
     
-    const user = await createEthAccount(web3);
+    const user = createEthAccount(web3);
     await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: admin}))
       .to.be.rejectedWith('NoPermission');
 
@@ -114,7 +113,7 @@
     const notAdmin = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     
-    const user = await createEthAccount(web3);
+    const user = createEthAccount(web3);
     await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: notAdmin}))
       .to.be.rejectedWith('NoPermission');
 
@@ -175,7 +174,7 @@
       .send();
     const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
 
-    const newAdmin = await createEthAccount(web3);
+    const newAdmin = createEthAccount(web3);
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
     {
@@ -226,7 +225,7 @@
 
     const admin0 = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     await collectionEvm.methods.addCollectionAdmin(admin0).send();
-    const admin1 = await createEthAccount(web3);
+    const admin1 = createEthAccount(web3);
     await collectionEvm.methods.addCollectionAdmin(admin1).send();
 
     await expect(collectionEvm.methods.removeCollectionAdmin(admin1).call({from: admin0}))
@@ -253,7 +252,7 @@
 
     const admin = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     await collectionEvm.methods.addCollectionAdmin(admin).send();
-    const notAdmin = await createEthAccount(web3);
+    const notAdmin = createEthAccount(web3);
 
     await expect(collectionEvm.methods.removeCollectionAdmin(admin).call({from: notAdmin}))
       .to.be.rejectedWith('NoPermission');
modifiedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
before · tests/src/eth/collectionSponsoring.test.ts
1import {addToAllowListExpectSuccess, bigIntToSub, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, getDetailedCollectionInfo, setCollectionSponsorExpectSuccess} from '../util/helpers';2import {itWeb3, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents, createEthAccountWithBalance, evmCollectionHelpers, getCollectionAddressFromResult, evmCollection, ethBalanceViaSub, subToEth} from './util/helpers';3import nonFungibleAbi from './nonFungibleAbi.json';4import {expect} from 'chai';5import {evmToAddress} from '@polkadot/util-crypto';6import {submitTransactionAsync} from '../substrate/substrate-api';7import getBalance from '../substrate/get-balance';89describe('evm collection sponsoring', () => {10  itWeb3('sponsors mint transactions', async ({web3, privateKeyWrapper}) => {11    const alice = privateKeyWrapper('//Alice');1213    const collection = await createCollectionExpectSuccess();14    await setCollectionSponsorExpectSuccess(collection, alice.address);15    await confirmSponsorshipExpectSuccess(collection);1617    const minter = createEthAccount(web3);18    expect(await web3.eth.getBalance(minter)).to.equal('0');1920    const address = collectionIdToAddress(collection);21    const contract = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collection), {from: minter, ...GAS_ARGS});2223    await enablePublicMintingExpectSuccess(alice, collection);24    await addToAllowListExpectSuccess(alice, collection, {Ethereum: minter});2526    const nextTokenId = await contract.methods.nextTokenId().call();27    expect(nextTokenId).to.equal('1');28    const result = await contract.methods.mint(minter, nextTokenId).send();29    const events = normalizeEvents(result.events);30    expect(events).to.be.deep.equal([31      {32        address,33        event: 'Transfer',34        args: {35          from: '0x0000000000000000000000000000000000000000',36          to: minter,37          tokenId: nextTokenId,38        },39      },40    ]);41  });4243  itWeb3('Set substrate sponsor', async ({api, web3, privateKeyWrapper}) => {44    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);45    const collectionHelpers = evmCollectionHelpers(web3, owner);46    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();47    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);48    const sponsor = privateKeyWrapper('//Alice');49    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);5051    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;52    result = await collectionEvm.methods.setCollectionSponsorSubstrate(sponsor.addressRaw).send({from: owner});53    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;54    55    const confirmTx = await api.tx.unique.confirmSponsorship(collectionId);56    await submitTransactionAsync(sponsor, confirmTx);57    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;58    59    const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});60    expect(bigIntToSub(api, BigInt(sponsorTuple[1]))).to.be.eq(sponsor.address);61  });6263  itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {64    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);65    const collectionHelpers = evmCollectionHelpers(web3, owner);66    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();67    const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);68    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);69    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);7071    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;72    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});73    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;74    75    await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});76    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;77    78    await collectionEvm.methods.removeCollectionSponsor().send({from: owner});79    80    const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});81    expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');82  });8384  itWeb3('Sponsoring collection from evm address via access list', async ({api, web3, privateKeyWrapper}) => {85    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);86    const collectionHelpers = evmCollectionHelpers(web3, owner);87    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();88    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);89    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);90    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);91    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});92    let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;93    const ss58Format = (api.registry.getChainProperties())!.toJSON().ss58Format;94    expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;95    expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));96    await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');9798    await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});99    collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;100    expect(collectionSub.sponsorship.isConfirmed).to.be.true;101    expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));102103    const user = createEthAccount(web3);104    const nextTokenId = await collectionEvm.methods.nextTokenId().call();105    expect(nextTokenId).to.be.equal('1');106107    const oldPermissions = (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();108    expect(oldPermissions.mintMode).to.be.false;109    expect(oldPermissions.access).to.be.equal('Normal');110111    await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});112    await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});113    await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});114115    const newPermissions = (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();116    expect(newPermissions.mintMode).to.be.true;117    expect(newPermissions.access).to.be.equal('AllowList');118119    const ownerBalanceBefore = await ethBalanceViaSub(api, owner);120    const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);121122    {123      const nextTokenId = await collectionEvm.methods.nextTokenId().call();124      expect(nextTokenId).to.be.equal('1');125      const result = await collectionEvm.methods.mintWithTokenURI(126        user,127        nextTokenId,128        'Test URI',129      ).send({from: user});130      const events = normalizeEvents(result.events);131132      expect(events).to.be.deep.equal([133        {134          address: collectionIdAddress,135          event: 'Transfer',136          args: {137            from: '0x0000000000000000000000000000000000000000',138            to: user,139            tokenId: nextTokenId,140          },141        },142      ]);143144      const ownerBalanceAfter = await ethBalanceViaSub(api, owner);145      const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);146147      expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');148      expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);149      expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;150    }151  });152153  itWeb3('Sponsoring collection from substrate address via access list', async ({api, web3, privateKeyWrapper}) => {154    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);155    const collectionHelpers = evmCollectionHelpers(web3, owner);156    const result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();157    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);158    const sponsor = privateKeyWrapper('//Alice');159    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);160161    await collectionEvm.methods.setCollectionSponsorSubstrate(sponsor.addressRaw).send({from: owner});162    163    const confirmTx = await api.tx.unique.confirmSponsorship(collectionId);164    await submitTransactionAsync(sponsor, confirmTx);165    166    const user = createEthAccount(web3);167    const nextTokenId = await collectionEvm.methods.nextTokenId().call();168    expect(nextTokenId).to.be.equal('1');169170    await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});171    await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});172    await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});173174    const ownerBalanceBefore = await ethBalanceViaSub(api, owner);175    const sponsorBalanceBefore = (await getBalance(api, [sponsor.address]))[0];176177    {178      const nextTokenId = await collectionEvm.methods.nextTokenId().call();179      expect(nextTokenId).to.be.equal('1');180      const result = await collectionEvm.methods.mintWithTokenURI(181        user,182        nextTokenId,183        'Test URI',184      ).send({from: user});185      const events = normalizeEvents(result.events);186187      expect(events).to.be.deep.equal([188        {189          address: collectionIdAddress,190          event: 'Transfer',191          args: {192            from: '0x0000000000000000000000000000000000000000',193            to: user,194            tokenId: nextTokenId,195          },196        },197      ]);198199      const ownerBalanceAfter = await ethBalanceViaSub(api, owner);200      const sponsorBalanceAfter = (await getBalance(api, [sponsor.address]))[0];201202      expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');203      expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);204      expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;205    }206  });207208  itWeb3('Check that transaction via EVM spend money from sponsor address', async ({api, web3, privateKeyWrapper}) => {209    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);210    const collectionHelpers = evmCollectionHelpers(web3, owner);211    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();212    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);213    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);214    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);215    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send();216    let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;217    const ss58Format = (api.registry.getChainProperties())!.toJSON().ss58Format;218    expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;219    expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));220    await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');221    const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);222    await sponsorCollection.methods.confirmCollectionSponsorship().send();223    collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;224    expect(collectionSub.sponsorship.isConfirmed).to.be.true;225    expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));226227    const user = createEthAccount(web3);228    await collectionEvm.methods.addCollectionAdmin(user).send();229    230    const ownerBalanceBefore = await ethBalanceViaSub(api, owner);231    const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);232    233  234    const userCollectionEvm = evmCollection(web3, user, collectionIdAddress);235    const nextTokenId = await userCollectionEvm.methods.nextTokenId().call();236    expect(nextTokenId).to.be.equal('1');237    result = await userCollectionEvm.methods.mintWithTokenURI(238      user,239      nextTokenId,240      'Test URI',241    ).send();242243    const events = normalizeEvents(result.events);244    const address = collectionIdToAddress(collectionId);245246    expect(events).to.be.deep.equal([247      {248        address,249        event: 'Transfer',250        args: {251          from: '0x0000000000000000000000000000000000000000',252          to: user,253          tokenId: nextTokenId,254        },255      },256    ]);257    expect(await userCollectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');258  259    const ownerBalanceAfter = await ethBalanceViaSub(api, owner);260    expect(ownerBalanceAfter).to.be.eq(ownerBalanceBefore);261    const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);262    expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;263  });264});
modifiedtests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -181,7 +181,7 @@
   });
   
   itWeb3('(!negative test!) Create collection (no funds)', async ({web3}) => {
-    const owner = await createEthAccount(web3);
+    const owner = createEthAccount(web3);
     const helper = evmCollectionHelpers(web3, owner);
     const collectionName = 'A';
     const description = 'A';
@@ -194,7 +194,7 @@
 
   itWeb3('(!negative test!) Check owner', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
-    const notOwner = await createEthAccount(web3);
+    const notOwner = createEthAccount(web3);
     const collectionHelpers = evmCollectionHelpers(web3, owner);
     const result = await collectionHelpers.methods.createNonfungibleCollection('A', 'A', 'A').send();
     const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
modifiedtests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -189,7 +189,7 @@
   });
   
   itWeb3('(!negative test!) Create collection (no funds)', async ({web3}) => {
-    const owner = await createEthAccount(web3);
+    const owner = createEthAccount(web3);
     const helper = evmCollectionHelpers(web3, owner);
     const collectionName = 'A';
     const description = 'A';
@@ -202,7 +202,7 @@
 
   itWeb3('(!negative test!) Check owner', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
-    const notOwner = await createEthAccount(web3);
+    const notOwner = createEthAccount(web3);
     const collectionHelpers = evmCollectionHelpers(web3, owner);
     const result = await collectionHelpers.methods.createRefungibleCollection('A', 'A', 'A').send();
     const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
modifiedtests/src/eth/nesting/nest.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -1,7 +1,7 @@
 import {IKeyringPair} from '@polkadot/types/types';
 import {Contract} from 'web3-eth-contract';
 
-import {itEth, EthUniqueHelper, usingEthPlaygrounds, expect} from '../util/playgrounds'
+import {itEth, EthUniqueHelper, usingEthPlaygrounds, expect} from '../util/playgrounds';
 
 const createNestingCollection = async (
   helper: EthUniqueHelper,
modifiedtests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -15,7 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {approve, createCollection, createRefungibleToken, transfer, transferFrom, UNIQUE, requirePallets, Pallets} from '../util/helpers';
-import {collectionIdFromAddress, collectionIdToAddress, createEthAccount, createEthAccountWithBalance, createNonfungibleCollection, createRefungibleCollection, evmCollection, evmCollectionHelpers, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, tokenIdToAddress, transferBalanceToEth, uniqueNFT, uniqueRefungible, uniqueRefungibleToken} from './util/helpers';
+import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, createRefungibleCollection, evmCollection, evmCollectionHelpers, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, tokenIdToAddress, transferBalanceToEth, uniqueRefungible, uniqueRefungibleToken} from './util/helpers';
 
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
modifiedtests/src/eth/util/playgrounds/index.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/index.ts
+++ b/tests/src/eth/util/playgrounds/index.ts
@@ -33,7 +33,7 @@
     await helper.disconnectWeb3();
     silentConsole.disable();
   }
-}
+};
   
 export async function itEth(name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean } = {}) {
   let i: any = it;
modifiedtests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -38,18 +38,18 @@
 class ContractGroup extends EthGroupBase {
   async findImports(imports?: ContractImports[]){
     if(!imports) return function(path: string) {
-      return {error: 'File not found'};
+      return {error: `File not found: ${path}`};
     };
   
     const knownImports = {} as any;
-    for(let imp of imports) {
+    for(const imp of imports) {
       knownImports[imp.solPath] = (await readFile(imp.fsPath)).toString();
     }
   
     return function(path: string) {
-      if(knownImports.hasOwnProperty(path)) return {contents: knownImports[path]};
-      return {error: 'File not found'};
-    }
+      if(knownImports.hasOwnPropertyDescriptor(path)) return {contents: knownImports[path]};
+      return {error: `File not found: ${path}`};
+    };
   }
 
   async compile(name: string, src: string, imports?: ContractImports[]): Promise<CompiledContract> {
@@ -85,7 +85,7 @@
     const contract = new web3.eth.Contract(abi, undefined, {
       data: object,
       from: signer,
-      gas: this.helper.eth.DEFAULT_GAS
+      gas: this.helper.eth.DEFAULT_GAS,
     });
     return await contract.deploy({data: object}).send({from: signer});
   }
@@ -108,7 +108,7 @@
     const abi = {
       'nft': nonFungibleAbi,
       'rft': refungibleAbi,
-      'ft': fungibleAbi
+      'ft': fungibleAbi,
     }[mode];
     const web3 = this.helper.getWeb3();
     return new web3.eth.Contract(abi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});
@@ -154,7 +154,7 @@
     await this.helper.executeExtrinsic(
       signer,
       'api.tx.evm.call', [this.helper.address.substrateToEth(signer.address), contractAddress, abi, value, gasLimit, gasPrice, null, null, []],
-      true, `Unable to perform evm.call`
+      true, 'Unable to perform evm.call',
     );
   }