git.delta.rocks / unique-network / refs/commits / 5a5760e9d7e0

difftreelog

test(util) fix linting warnings

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

2 files changed

modifiedtests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth
before · tests/src/util/playgrounds/unique.dev.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {mnemonicGenerate} from '@polkadot/util-crypto';5import {UniqueHelper} from './unique';6import {ApiPromise, WsProvider} from '@polkadot/api';7import * as defs from '../../interfaces/definitions';8import {IKeyringPair} from '@polkadot/types/types';91011export class SilentLogger {12  log(msg: any, level: any): void { }13  level = {14    ERROR: 'ERROR' as const,15    WARNING: 'WARNING' as const,16    INFO: 'INFO' as const,17  };18}192021export class SilentConsole {22  // TODO: Remove, this is temporary: Filter unneeded API output23  // (Jaco promised it will be removed in the next version)24  consoleErr: any;25  consoleLog: any;26  consoleWarn: any;2728  constructor() {29    this.consoleErr = console.error;30    this.consoleLog = console.log;31    this.consoleWarn = console.warn;32  }3334  enable() {  35    const outFn = (printer: any) => (...args: any[]) => {36      for (const arg of args) {37        for (const arg of args) {38          if (typeof arg !== 'string')39            continue;40          if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis: UniqueApi/2, RmrkApi/1') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')41            return;42        }43      }44      printer(...args);45    };46  47    console.error = outFn(this.consoleErr.bind(console));48    console.log = outFn(this.consoleLog.bind(console));49    console.warn = outFn(this.consoleWarn.bind(console));50  }5152  disable() {53    console.error = this.consoleErr;54    console.log = this.consoleLog;55    console.warn = this.consoleWarn;56  }57}585960export class DevUniqueHelper extends UniqueHelper {61  /**62   * Arrange methods for tests63   */64  arrange: ArrangeGroup;6566  constructor(logger: { log: (msg: any, level: any) => void, level: any }) {67    super(logger);68    this.arrange = new ArrangeGroup(this);69  }7071  async connect(wsEndpoint: string, listeners?: any): Promise<void> {72    const wsProvider = new WsProvider(wsEndpoint);73    this.api = new ApiPromise({74      provider: wsProvider,75      signedExtensions: {76        ContractHelpers: {77          extrinsic: {},78          payload: {},79        },80        FakeTransactionFinalizer: {81          extrinsic: {},82          payload: {},83        },84      },85      rpc: {86        unique: defs.unique.rpc,87        rmrk: defs.rmrk.rpc,88        eth: {89          feeHistory: {90            description: 'Dummy',91            params: [],92            type: 'u8',93          },94          maxPriorityFeePerGas: {95            description: 'Dummy',96            params: [],97            type: 'u8',98          },99        },100      },101    });102    await this.api.isReadyOrError;103    this.network = await UniqueHelper.detectNetwork(this.api);104  }105}106107class ArrangeGroup {108  helper: UniqueHelper;109110  constructor(helper: UniqueHelper) {111    this.helper = helper;112  }113114  /**115   * Generates accounts with the specified UNQ token balance 116   * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.117   * @param donor donor account for balances118   * @returns array of newly created accounts119   * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 120   */121  createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {122    let nonce = await this.helper.chain.getNonce(donor.address);123    const tokenNominal = this.helper.balance.getOneTokenNominal();124    const transactions = [];125    const accounts: IKeyringPair[] = [];126    for (const balance of balances) {127      const recepient = this.helper.util.fromSeed(mnemonicGenerate());128      accounts.push(recepient);129      if (balance !== 0n) {130        const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, balance * tokenNominal]);131        transactions.push(this.helper.signTransaction(donor, tx, 'account generation', {nonce}));132        nonce++;133      }134    }135136    await Promise.all(transactions).catch(e => {});137    138    //#region TODO remove this region, when nonce problem will be solved139    const checkBalances = async () => {140      let isSuccess = true;141      for (let i = 0; i < balances.length; i++) {142        const balance = await this.helper.balance.getSubstrate(accounts[i].address);143        if (balance !== balances[i] * tokenNominal) {144          isSuccess = false;145          break;146        }147      }148      return isSuccess;149    };150151    let accountsCreated = false;152    // checkBalances retry up to 5 blocks153    for (let index = 0; index < 5; index++) {154      console.log(await this.helper.chain.getLatestBlockNumber());155      accountsCreated = await checkBalances();156      if(accountsCreated) break;157      await this.waitNewBlocks(1);158    }159160    if (!accountsCreated) throw Error('Accounts generation failed');161    //#endregion162163    return accounts;164  };165166  /**167   * Wait for specified bnumber of blocks168   * @param blocksCount number of blocks to wait169   * @returns 170   */171  async waitNewBlocks(blocksCount = 1): Promise<void> {172    const promise = new Promise<void>(async (resolve) => {173      const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(() => {174        if (blocksCount > 0) {175          blocksCount--;176        } else {177          unsubscribe();178          resolve();179        }180      });181    });182    return promise;183  }184}
after · tests/src/util/playgrounds/unique.dev.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {mnemonicGenerate} from '@polkadot/util-crypto';5import {UniqueHelper} from './unique';6import {ApiPromise, WsProvider} from '@polkadot/api';7import * as defs from '../../interfaces/definitions';8import {IKeyringPair} from '@polkadot/types/types';91011export class SilentLogger {12  log(_msg: any, _level: any): void { }13  level = {14    ERROR: 'ERROR' as const,15    WARNING: 'WARNING' as const,16    INFO: 'INFO' as const,17  };18}192021export class SilentConsole {22  // TODO: Remove, this is temporary: Filter unneeded API output23  // (Jaco promised it will be removed in the next version)24  consoleErr: any;25  consoleLog: any;26  consoleWarn: any;2728  constructor() {29    this.consoleErr = console.error;30    this.consoleLog = console.log;31    this.consoleWarn = console.warn;32  }3334  enable() {  35    const outFn = (printer: any) => (...args: any[]) => {36      for (const arg of args) {37        if (typeof arg !== 'string')38          continue;39        if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis: UniqueApi/2, RmrkApi/1') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')40          return;41      }42      printer(...args);43    };44  45    console.error = outFn(this.consoleErr.bind(console));46    console.log = outFn(this.consoleLog.bind(console));47    console.warn = outFn(this.consoleWarn.bind(console));48  }4950  disable() {51    console.error = this.consoleErr;52    console.log = this.consoleLog;53    console.warn = this.consoleWarn;54  }55}565758export class DevUniqueHelper extends UniqueHelper {59  /**60   * Arrange methods for tests61   */62  arrange: ArrangeGroup;6364  constructor(logger: { log: (msg: any, level: any) => void, level: any }) {65    super(logger);66    this.arrange = new ArrangeGroup(this);67  }6869  async connect(wsEndpoint: string/*, listeners?: any*/): Promise<void> {70    const wsProvider = new WsProvider(wsEndpoint);71    this.api = new ApiPromise({72      provider: wsProvider,73      signedExtensions: {74        ContractHelpers: {75          extrinsic: {},76          payload: {},77        },78        FakeTransactionFinalizer: {79          extrinsic: {},80          payload: {},81        },82      },83      rpc: {84        unique: defs.unique.rpc,85        rmrk: defs.rmrk.rpc,86        eth: {87          feeHistory: {88            description: 'Dummy',89            params: [],90            type: 'u8',91          },92          maxPriorityFeePerGas: {93            description: 'Dummy',94            params: [],95            type: 'u8',96          },97        },98      },99    });100    await this.api.isReadyOrError;101    this.network = await UniqueHelper.detectNetwork(this.api);102  }103}104105class ArrangeGroup {106  helper: UniqueHelper;107108  constructor(helper: UniqueHelper) {109    this.helper = helper;110  }111112  /**113   * Generates accounts with the specified UNQ token balance 114   * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.115   * @param donor donor account for balances116   * @returns array of newly created accounts117   * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 118   */119  createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {120    let nonce = await this.helper.chain.getNonce(donor.address);121    const tokenNominal = this.helper.balance.getOneTokenNominal();122    const transactions = [];123    const accounts: IKeyringPair[] = [];124    for (const balance of balances) {125      const recepient = this.helper.util.fromSeed(mnemonicGenerate());126      accounts.push(recepient);127      if (balance !== 0n) {128        const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, balance * tokenNominal]);129        transactions.push(this.helper.signTransaction(donor, tx, 'account generation', {nonce}));130        nonce++;131      }132    }133134    await Promise.all(transactions).catch(_e => {});135    136    //#region TODO remove this region, when nonce problem will be solved137    const checkBalances = async () => {138      let isSuccess = true;139      for (let i = 0; i < balances.length; i++) {140        const balance = await this.helper.balance.getSubstrate(accounts[i].address);141        if (balance !== balances[i] * tokenNominal) {142          isSuccess = false;143          break;144        }145      }146      return isSuccess;147    };148149    let accountsCreated = false;150    // checkBalances retry up to 5 blocks151    for (let index = 0; index < 5; index++) {152      console.log(await this.helper.chain.getLatestBlockNumber());153      accountsCreated = await checkBalances();154      if(accountsCreated) break;155      await this.waitNewBlocks(1);156    }157158    if (!accountsCreated) throw Error('Accounts generation failed');159    //#endregion160161    return accounts;162  };163 164  /**165   * Wait for specified bnumber of blocks166   * @param blocksCount number of blocks to wait167   * @returns 168   */169  async waitNewBlocks(blocksCount = 1): Promise<void> {170    // eslint-disable-next-line no-async-promise-executor171    const promise = new Promise<void>(async (resolve) => {172      const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(() => {173        if (blocksCount > 0) {174          blocksCount--;175        } else {176          unsubscribe();177          resolve();178        }179      });180    });181    return promise;182  }183}
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -317,6 +317,7 @@
       if(options !== null) return transaction.signAndSend(sender, options, callback);
       return transaction.signAndSend(sender, callback);
     };
+    // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve, reject) => {
       try {
         const unsub = await sign((result: any) => {
@@ -1100,11 +1101,11 @@
     return this.getCollectionObject(this.helper.util.extractCollectionIdFromCreationResult(creationResult, errorLabel));
   }
 
-  getCollectionObject(collectionId: number): any {
+  getCollectionObject(_collectionId: number): any {
     return null;
   }
 
-  getTokenObject(collectionId: number, tokenId: number): any {
+  getTokenObject(_collectionId: number, _tokenId: number): any {
     return null;
   }
 }