difftreelog
fix tests
in: master
2 files changed
tests/src/eth/events.test.tsdiffbeforeafterboth--- a/tests/src/eth/events.test.ts
+++ b/tests/src/eth/events.test.ts
@@ -31,6 +31,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionCreated', 'CollectionDestroyed']}]);
const {collectionAddress, events: ethEvents} = await helper.eth.createCollection(mode, owner, 'A', 'B', 'C');
+ await helper.wait.newBlocks(1);
{
expect(ethEvents).to.be.like([
{
@@ -48,6 +49,7 @@
{
const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
const result = await collectionHelper.methods.destroyCollection(collectionAddress).send({from:owner});
+ await helper.wait.newBlocks(1);
expect(result.events).to.be.like({
CollectionDestroyed: {
returnValues: {
@@ -73,6 +75,7 @@
ethEvents.push(event);
});
await collection.methods.setCollectionProperties([{key: 'A', value: [0,1,2,3]}]).send({from:owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -90,6 +93,7 @@
ethEvents.push(event);
});
await collection.methods.deleteCollectionProperties(['A']).send({from:owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -114,6 +118,7 @@
});
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['PropertyPermissionSet']}]);
await collection.methods.setTokenPropertyPermission('testKey', true, true, true).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(eethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -140,6 +145,7 @@
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['AllowListAddressAdded', 'AllowListAddressRemoved']}]);
{
await collection.methods.addToCollectionAllowListCross(user).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -154,6 +160,7 @@
}
{
await collection.methods.removeFromCollectionAllowListCross(user).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents.length).to.be.eq(1);
expect(ethEvents).to.be.like([
{
@@ -181,6 +188,7 @@
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionAdminAdded', 'CollectionAdminRemoved']}]);
{
await collection.methods.addCollectionAdminCross(user).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -195,6 +203,7 @@
}
{
await collection.methods.removeCollectionAdminCross(user).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -220,6 +229,7 @@
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionLimitSet']}]);
{
await collection.methods.setCollectionLimit('ownerCanTransfer', 0n).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -246,6 +256,7 @@
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionOwnedChanged']}]);
{
await collection.methods.changeCollectionOwnerCross(new_owner).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -271,6 +282,7 @@
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionPermissionSet']}]);
{
await collection.methods.setCollectionMintMode(true).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -285,6 +297,7 @@
}
{
await collection.methods.setCollectionAccess(1).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -313,6 +326,7 @@
]}]);
{
await collection.methods.setCollectionSponsorCross(sponsor).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -327,6 +341,7 @@
}
{
await collection.methods.confirmCollectionSponsorship().send({from: sponsor.eth});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'CollectionChanged',
@@ -371,6 +386,7 @@
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['TokenPropertySet', 'TokenPropertyDeleted']}]);
{
await collection.methods.setProperties(tokenId, [{key: 'A', value: [1,2,3]}]).send({from: owner});
+ await helper.wait.newBlocks(1);
expect(ethEvents).to.be.like([
{
event: 'TokenChanged',
@@ -398,7 +414,7 @@
unsubscribe();
}
-describe('[FT] Sync sub & eth events', () => {
+describe.only('[FT] Sync sub & eth events', () => {
const mode: TCollectionMode = 'ft';
itEth('CollectionCreated and CollectionDestroyed events', async ({helper}) => {
@@ -434,7 +450,7 @@
});
});
-describe('[NFT] Sync sub & eth events', () => {
+describe.only('[NFT] Sync sub & eth events', () => {
const mode: TCollectionMode = 'nft';
itEth('CollectionCreated and CollectionDestroyed events', async ({helper}) => {
@@ -478,7 +494,7 @@
});
});
-describe('[RFT] Sync sub & eth events', () => {
+describe.only('[RFT] Sync sub & eth events', () => {
const mode: TCollectionMode = 'rft';
itEth('CollectionCreated and CollectionDestroyed events', async ({helper}) => {
tests/src/util/index.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import * as path from 'path';5import * as crypto from 'crypto';6import {IKeyringPair} from '@polkadot/types/types';7import chai from 'chai';8import chaiAsPromised from 'chai-as-promised';9import {Context} from 'mocha';10import config from '../config';11import {ChainHelperBase} from './playgrounds/unique';12import {ILogger} from './playgrounds/types';13import {DevUniqueHelper, SilentLogger, SilentConsole, DevMoonbeamHelper, DevMoonriverHelper, DevAcalaHelper, DevKaruraHelper, DevRelayHelper, DevWestmintHelper} from './playgrounds/unique.dev';1415chai.use(chaiAsPromised);16export const expect = chai.expect;1718const getTestHash = (filename: string) => {19 return crypto.createHash('md5').update(filename).digest('hex');20};2122export const getTestSeed = (filename: string) => {23 return `//Alice+${getTestHash(filename)}`;24};2526async function usingPlaygroundsGeneral<T extends ChainHelperBase>(helperType: new(logger: ILogger) => T, url: string, code: (helper: T, privateKey: (seed: string | {filename: string, ignoreFundsPresence?: boolean}) => Promise<IKeyringPair>) => Promise<void>) {27 const silentConsole = new SilentConsole();28 silentConsole.enable();2930 const helper = new helperType(new SilentLogger());3132 try {33 await helper.connect(url);34 const ss58Format = helper.chain.getChainProperties().ss58Format;35 const privateKey = async (seed: string | {filename: string, ignoreFundsPresence?: boolean}) => {36 if (typeof seed === 'string') {37 return helper.util.fromSeed(seed, ss58Format);38 }39 else {40 const actualSeed = getTestSeed(seed.filename);41 let account = helper.util.fromSeed(actualSeed, ss58Format);42 // here's to hoping that no 43 if (!seed.ignoreFundsPresence && ((helper as any)['balance'] == undefined || await (helper as any).balance.getSubstrate(account.address) < MINIMUM_DONOR_FUND)) {44 console.warn(`${path.basename(seed.filename)}: Not enough funds present on the filename account. Using the default one as the donor instead.`);45 account = helper.util.fromSeed('//Alice', ss58Format);46 }47 return account;48 }49 };50 await code(helper, privateKey);51 }52 finally {53 await helper.disconnect();54 silentConsole.disable();55 }56}5758export const usingPlaygrounds = (code: (helper: DevUniqueHelper, privateKey: (seed: string | {filename: string, ignoreFundsPresence?: boolean}) => Promise<IKeyringPair>) => Promise<void>, url: string = config.substrateUrl) => {59 return usingPlaygroundsGeneral<DevUniqueHelper>(DevUniqueHelper, url, code);60};6162export const usingWestmintPlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {63 return usingPlaygroundsGeneral<DevWestmintHelper>(DevWestmintHelper, url, code);64};6566export const usingRelayPlaygrounds = (url: string, code: (helper: DevRelayHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {67 return usingPlaygroundsGeneral<DevRelayHelper>(DevRelayHelper, url, code);68};6970export const usingAcalaPlaygrounds = (url: string, code: (helper: DevAcalaHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {71 return usingPlaygroundsGeneral<DevAcalaHelper>(DevAcalaHelper, url, code);72};7374export const usingKaruraPlaygrounds = (url: string, code: (helper: DevKaruraHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {75 return usingPlaygroundsGeneral<DevKaruraHelper>(DevAcalaHelper, url, code);76};7778export const usingMoonbeamPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {79 return usingPlaygroundsGeneral<DevMoonbeamHelper>(DevMoonbeamHelper, url, code);80};8182export const usingMoonriverPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {83 return usingPlaygroundsGeneral<DevMoonriverHelper>(DevMoonriverHelper, url, code);84};8586export const MINIMUM_DONOR_FUND = 100_000n;87export const DONOR_FUNDING = 1_000_000n;8889export enum Pallets {90 Inflation = 'inflation',91 RmrkCore = 'rmrkcore',92 RmrkEquip = 'rmrkequip',93 ReFungible = 'refungible',94 Fungible = 'fungible',95 NFT = 'nonfungible',96 Scheduler = 'scheduler',97 AppPromotion = 'apppromotion',98 TestUtils = 'testutils',99}100101export function requirePalletsOrSkip(test: Context, helper: DevUniqueHelper, requiredPallets: string[]) {102 const missingPallets = helper.fetchMissingPalletNames(requiredPallets);103 104 if (missingPallets.length > 0) {105 const skipMsg = `\tSkipping test '${test.test?.title}'.\n\tThe following pallets are missing:\n\t- ${missingPallets.join('\n\t- ')}`;106 console.warn('\x1b[38:5:208m%s\x1b[0m', skipMsg);107 test.skip();108 }109}110111export function itSub(name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {112 (opts.only ? it.only : 113 opts.skip ? it.skip : it)(name, async function () {114 await usingPlaygrounds(async (helper, privateKey) => {115 if (opts.requiredPallets) {116 requirePalletsOrSkip(this, helper, opts.requiredPallets);117 }118 119 await cb({helper, privateKey});120 });121 });122}123export function itSubIfWithPallet(name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {124 return itSub(name, cb, {requiredPallets: required, ...opts});125}126itSub.only = (name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSub(name, cb, {only: true});127itSub.skip = (name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSub(name, cb, {skip: true});128129itSubIfWithPallet.only = (name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSubIfWithPallet(name, required, cb, {only: true});130itSubIfWithPallet.skip = (name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSubIfWithPallet(name, required, cb, {skip: true});131itSub.ifWithPallets = itSubIfWithPallet;132133export type SchedKind = 'anon' | 'named';134135export function itSched(136 name: string,137 cb: (schedKind: SchedKind, apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any,138 opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {},139) {140 itSub(name + ' (anonymous scheduling)', (apis) => cb('anon', apis), opts);141 itSub(name + ' (named scheduling)', (apis) => cb('named', apis), opts);142}143itSched.only = (name: string, cb: (schedKind: SchedKind, apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSched(name, cb, {only: true});144itSched.skip = (name: string, cb: (schedKind: SchedKind, apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSched(name, cb, {skip: true});145itSched.ifWithPallets = itSchedIfWithPallets;146147function itSchedIfWithPallets(name: string, required: string[], cb: (schedKind: SchedKind, apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {148 return itSched(name, cb, {requiredPallets: required, ...opts});149}150151export function describeXCM(title: string, fn: (this: Mocha.Suite) => void, opts: {skip?: boolean} = {}) {152 (process.env.RUN_XCM_TESTS && !opts.skip153 ? describe154 : describe.skip)(title, fn);155}156157describeXCM.skip = (name: string, fn: (this: Mocha.Suite) => void) => describeXCM(name, fn, {skip: true});