difftreelog
tests: adjust minimum donor fund structure + fix app-promotion.seqtest's 'after' if the pallet is not present
in: master
3 files changed
tests/src/app-promotion.seqtest.tsdiffbeforeafterboth34 });34 });35 });35 });363637 after(async () => {37 after(async function () {38 await usingPlaygrounds(async (helper) => {38 await usingPlaygrounds(async (helper) => {39 if (helper.fetchMissingPalletNames([Pallets.AppPromotion]).length != 0) return;39 const api = helper.getApi();40 const api = helper.getApi();40 await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));41 await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));41 });42 });tests/src/util/globalSetup.tsdiffbeforeafterboth--- a/tests/src/util/globalSetup.ts
+++ b/tests/src/util/globalSetup.ts
@@ -1,7 +1,7 @@
// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
// SPDX-License-Identifier: Apache-2.0
-import {usingPlaygrounds, Pallets} from './index';
+import {usingPlaygrounds, Pallets, DONOR_FUNDING, MINIMUM_DONOR_FUND} from './index';
import * as path from 'path';
import {promises as fs} from 'fs';
@@ -67,11 +67,11 @@
const account = await privateKey({filename: f, ignoreFundsPresence: true});
const aliceBalance = await helper.balance.getSubstrate(account.address);
- if (aliceBalance < 100_000n * oneToken) {
+ if (aliceBalance < MINIMUM_DONOR_FUND * oneToken) {
tx.push(helper.executeExtrinsic(
alice,
'api.tx.balances.transfer',
- [account.address, 1_000_000n * oneToken],
+ [account.address, DONOR_FUNDING * oneToken],
true,
{nonce: nonce + balanceGrantedCounter++},
).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));
tests/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',