git.delta.rocks / unique-network / refs/commits / 23067ec51dc9

difftreelog

tests: adjust minimum donor fund structure + fix app-promotion.seqtest's 'after' if the pallet is not present

Fahrrader2022-10-13parent: #02e004a.patch.diff
in: master

3 files changed

modifiedtests/src/app-promotion.seqtest.tsdiffbeforeafterboth
--- a/tests/src/app-promotion.seqtest.ts
+++ b/tests/src/app-promotion.seqtest.ts
@@ -34,8 +34,9 @@
     });
   });
 
-  after(async () => {
+  after(async function () {
     await usingPlaygrounds(async (helper) => {
+      if (helper.fetchMissingPalletNames([Pallets.AppPromotion]).length != 0) return;
       const api = helper.getApi();
       await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));
     });
modifiedtests/src/util/globalSetup.tsdiffbeforeafterboth
before · tests/src/util/globalSetup.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {usingPlaygrounds, Pallets} from './index';5import * as path from 'path';6import {promises as fs} from 'fs';78// This function should be called before running test suites.9const globalSetup = async (): Promise<void> => {10  await usingPlaygrounds(async (helper, privateKey) => {11    try {12      // 1. Create donors for test files13      await fundFilenamesWithRetries(3)14        .then((result) => {15          if (!result) Promise.reject();16        });1718      // 2. Set up App Promotion admin 19      const missingPallets = helper.fetchMissingPalletNames([Pallets.AppPromotion]);20      if (missingPallets.length === 0) {21        const superuser = await privateKey('//Alice');22        const palletAddress = helper.arrange.calculatePalletAddress('appstake');23        const palletAdmin = await privateKey('//PromotionAdmin');24        const api = helper.getApi();25        await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));26        const nominal = helper.balance.getOneTokenNominal();27        await helper.balance.transferToSubstrate(superuser, palletAdmin.address, 1000n * nominal);28        await helper.balance.transferToSubstrate(superuser, palletAddress, 1000n * nominal);29      }30    } catch (error) {31      console.error(error);32      Promise.reject();33    }34  });35};3637async function getFiles(rootPath: string): Promise<string[]> {38  const files = await fs.readdir(rootPath, {withFileTypes: true});39  const filenames: string[] = [];40  for (const entry of files) {41    const res = path.resolve(rootPath, entry.name);42    if (entry.isDirectory()) {43      filenames.push(...await getFiles(res));44    } else {45      filenames.push(res);46    }47  }48  return filenames;49}5051const fundFilenames = async () => {52  await usingPlaygrounds(async (helper, privateKey) => {53    const oneToken = helper.balance.getOneTokenNominal();54    const alice = await privateKey('//Alice');55    const nonce = await helper.chain.getNonce(alice.address);56    const filenames = await getFiles(path.resolve(__dirname, '..'));5758    // batching is actually undesireable, it takes away the time while all the transactions actually succeed59    const batchSize = 300;60    let balanceGrantedCounter = 0;61    for (let b = 0; b < filenames.length; b += batchSize) {62      const tx = [];63      let batchBalanceGrantedCounter = 0;64      for (let i = 0; batchBalanceGrantedCounter < batchSize && b + i < filenames.length; i++) {65        const f = filenames[b + i];66        if (!f.endsWith('.test.ts') && !f.endsWith('seqtest.ts') || f.includes('.outdated')) continue;67        const account = await privateKey({filename: f, ignoreFundsPresence: true});68        const aliceBalance = await helper.balance.getSubstrate(account.address);6970        if (aliceBalance < 100_000n * oneToken) {71          tx.push(helper.executeExtrinsic(72            alice, 73            'api.tx.balances.transfer',74            [account.address, 1_000_000n * oneToken],75            true,76            {nonce: nonce + balanceGrantedCounter++},77          ).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));78          batchBalanceGrantedCounter++;79        }80      }8182      if(tx.length > 0) {83        console.log(`Granting funds to ${batchBalanceGrantedCounter} filename accounts.`);84        const result = await Promise.all(tx);85        if (result && result.lastIndexOf(false) > -1) throw new Error('The transactions actually probably succeeded, should check the balances.');86      }87    }8889    if (balanceGrantedCounter == 0) console.log('No account needs additional funding.');90  });91};9293const fundFilenamesWithRetries = async (retriesLeft: number): Promise<boolean> => {94  if (retriesLeft <= 0) return Promise.resolve(false);95  return fundFilenames()96    .then(() => Promise.resolve(true))97    .catch(e => {98      console.error(e);99      console.error(`Some transactions might have failed. ${retriesLeft > 1 ? 'Retrying...' : 'Something is wrong.'}\n`);100      return fundFilenamesWithRetries(--retriesLeft);101    });102};103104globalSetup().catch(() => process.exit(1));
after · tests/src/util/globalSetup.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {usingPlaygrounds, Pallets, DONOR_FUNDING, MINIMUM_DONOR_FUND} from './index';5import * as path from 'path';6import {promises as fs} from 'fs';78// This function should be called before running test suites.9const globalSetup = async (): Promise<void> => {10  await usingPlaygrounds(async (helper, privateKey) => {11    try {12      // 1. Create donors for test files13      await fundFilenamesWithRetries(3)14        .then((result) => {15          if (!result) Promise.reject();16        });1718      // 2. Set up App Promotion admin 19      const missingPallets = helper.fetchMissingPalletNames([Pallets.AppPromotion]);20      if (missingPallets.length === 0) {21        const superuser = await privateKey('//Alice');22        const palletAddress = helper.arrange.calculatePalletAddress('appstake');23        const palletAdmin = await privateKey('//PromotionAdmin');24        const api = helper.getApi();25        await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));26        const nominal = helper.balance.getOneTokenNominal();27        await helper.balance.transferToSubstrate(superuser, palletAdmin.address, 1000n * nominal);28        await helper.balance.transferToSubstrate(superuser, palletAddress, 1000n * nominal);29      }30    } catch (error) {31      console.error(error);32      Promise.reject();33    }34  });35};3637async function getFiles(rootPath: string): Promise<string[]> {38  const files = await fs.readdir(rootPath, {withFileTypes: true});39  const filenames: string[] = [];40  for (const entry of files) {41    const res = path.resolve(rootPath, entry.name);42    if (entry.isDirectory()) {43      filenames.push(...await getFiles(res));44    } else {45      filenames.push(res);46    }47  }48  return filenames;49}5051const fundFilenames = async () => {52  await usingPlaygrounds(async (helper, privateKey) => {53    const oneToken = helper.balance.getOneTokenNominal();54    const alice = await privateKey('//Alice');55    const nonce = await helper.chain.getNonce(alice.address);56    const filenames = await getFiles(path.resolve(__dirname, '..'));5758    // batching is actually undesireable, it takes away the time while all the transactions actually succeed59    const batchSize = 300;60    let balanceGrantedCounter = 0;61    for (let b = 0; b < filenames.length; b += batchSize) {62      const tx = [];63      let batchBalanceGrantedCounter = 0;64      for (let i = 0; batchBalanceGrantedCounter < batchSize && b + i < filenames.length; i++) {65        const f = filenames[b + i];66        if (!f.endsWith('.test.ts') && !f.endsWith('seqtest.ts') || f.includes('.outdated')) continue;67        const account = await privateKey({filename: f, ignoreFundsPresence: true});68        const aliceBalance = await helper.balance.getSubstrate(account.address);6970        if (aliceBalance < MINIMUM_DONOR_FUND * oneToken) {71          tx.push(helper.executeExtrinsic(72            alice, 73            'api.tx.balances.transfer',74            [account.address, DONOR_FUNDING * oneToken],75            true,76            {nonce: nonce + balanceGrantedCounter++},77          ).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));78          batchBalanceGrantedCounter++;79        }80      }8182      if(tx.length > 0) {83        console.log(`Granting funds to ${batchBalanceGrantedCounter} filename accounts.`);84        const result = await Promise.all(tx);85        if (result && result.lastIndexOf(false) > -1) throw new Error('The transactions actually probably succeeded, should check the balances.');86      }87    }8889    if (balanceGrantedCounter == 0) console.log('No account needs additional funding.');90  });91};9293const fundFilenamesWithRetries = async (retriesLeft: number): Promise<boolean> => {94  if (retriesLeft <= 0) return Promise.resolve(false);95  return fundFilenames()96    .then(() => Promise.resolve(true))97    .catch(e => {98      console.error(e);99      console.error(`Some transactions might have failed. ${retriesLeft > 1 ? 'Retrying...' : 'Something is wrong.'}\n`);100      return fundFilenamesWithRetries(--retriesLeft);101    });102};103104globalSetup().catch(() => process.exit(1));
modifiedtests/src/util/index.tsdiffbeforeafterboth
--- a/tests/src/util/index.ts
+++ b/tests/src/util/index.ts
@@ -38,7 +38,7 @@
       else {
         const actualSeed = getTestSeed(seed.filename);
         let account = helper.util.fromSeed(actualSeed, ss58Format);
-        if (!seed.ignoreFundsPresence && await helper.balance.getSubstrate(account.address) == 0n) {
+        if (!seed.ignoreFundsPresence && await helper.balance.getSubstrate(account.address) < MINIMUM_DONOR_FUND) {
           console.warn(`${path.basename(seed.filename)}: Not enough funds present on the filename account. Using the default one as the donor instead.`);
           account = helper.util.fromSeed('//Alice', ss58Format);
         }
@@ -53,6 +53,9 @@
   }
 };
 
+export const MINIMUM_DONOR_FUND = 100_000n;
+export const DONOR_FUNDING = 1_000_000n;
+
 export enum Pallets {
   Inflation = 'inflation',
   RmrkCore = 'rmrkcore',