From 104c91ace9f18a084e8f5a1d941f4ffbf5aa4704 Mon Sep 17 00:00:00 2001
From: rkv <dontgofun@gmail.com>
Date: Tue, 04 Oct 2022 12:32:44 +0000
Subject: [PATCH] fix: remove aux func getMessage


---
--- a/tests/src/check-event/burnItemEvent.test.ts
+++ b/tests/src/check-event/burnItemEvent.test.ts
@@ -16,15 +16,12 @@
 
 // https://unique-network.readthedocs.io/en/latest/jsapi.html#setchainlimits
 import {IKeyringPair} from '@polkadot/types/types';
-import {getEventMessage} from '../util/helpers';
 import {usingPlaygrounds, expect, itSub} from '../util/playgrounds';
+import {IEvent} from '../util/playgrounds/types';
 
 
 describe('Burn Item event ', () => {
   let alice: IKeyringPair;
-  const checkSection = 'ItemDestroyed';
-  const checkTreasury = 'Deposit';
-  const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       const donor = privateKey('//Alice');
@@ -36,9 +33,11 @@
     const token = await collection.mintToken(alice, {Substrate: alice.address});
     await token.burn(alice);
 
-    const msg = JSON.stringify(getEventMessage(helper.chainLog[helper.chainLog.length - 1].events));
-    expect(msg).to.be.contain(checkSection);
-    expect(msg).to.be.contain(checkTreasury);
-    expect(msg).to.be.contain(checkSystem);
+    const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
+    const eventStrings = event.map(e => `${e.section}.${e.method}`);
+
+    expect(eventStrings).to.contains('common.ItemDestroyed');
+    expect(eventStrings).to.contains('treasury.Deposit');
+    expect(eventStrings).to.contains('system.ExtrinsicSuccess');
   });
 });
--- a/tests/src/check-event/createCollectionEvent.test.ts
+++ b/tests/src/check-event/createCollectionEvent.test.ts
@@ -16,14 +16,11 @@
 
 // https://unique-network.readthedocs.io/en/latest/jsapi.html#setchainlimits
 import {IKeyringPair} from '@polkadot/types/types';
-import {getEventMessage} from '../util/helpers';
 import {usingPlaygrounds, itSub, expect} from '../util/playgrounds';
+import {IEvent} from '../util/playgrounds/types';
 
 describe('Create collection event ', () => {
   let alice: IKeyringPair;
-  const checkSection = 'CollectionCreated';
-  const checkTreasury = 'Deposit';
-  const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       const donor = privateKey('//Alice');
@@ -32,9 +29,11 @@
   });
   itSub('Check event from createCollection(): ', async ({helper}) => {
     await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
-    const msg = JSON.stringify(getEventMessage(helper.chainLog[helper.chainLog.length - 1].events));
-    expect(msg).to.be.contain(checkSection);
-    expect(msg).to.be.contain(checkTreasury);
-    expect(msg).to.be.contain(checkSystem);
+    const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
+    const eventStrings = event.map(e => `${e.section}.${e.method}`);
+
+    expect(eventStrings).to.contains('common.CollectionCreated');
+    expect(eventStrings).to.contains('treasury.Deposit');
+    expect(eventStrings).to.contains('system.ExtrinsicSuccess');
   });
 });
--- a/tests/src/check-event/createItemEvent.test.ts
+++ b/tests/src/check-event/createItemEvent.test.ts
@@ -16,14 +16,11 @@
 
 // https://unique-network.readthedocs.io/en/latest/jsapi.html#setchainlimits
 import {IKeyringPair} from '@polkadot/types/types';
-import {getEventMessage} from '../util/helpers';
 import {itSub, usingPlaygrounds, expect} from '../util/playgrounds';
+import {IEvent} from '../util/playgrounds/types';
 
 describe('Create Item event ', () => {
   let alice: IKeyringPair;
-  const checkSection = 'ItemCreated';
-  const checkTreasury = 'Deposit';
-  const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       const donor = privateKey('//Alice');
@@ -33,9 +30,11 @@
   itSub('Check event from createItem(): ', async ({helper}) => {
     const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
     await collection.mintToken(alice, {Substrate: alice.address});
-    const msg = JSON.stringify(getEventMessage(helper.chainLog[helper.chainLog.length - 1].events));
-    expect(msg).to.be.contain(checkSection);
-    expect(msg).to.be.contain(checkTreasury);
-    expect(msg).to.be.contain(checkSystem);
+    const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
+    const eventStrings = event.map(e => `${e.section}.${e.method}`);
+
+    expect(eventStrings).to.contains('common.ItemCreated');
+    expect(eventStrings).to.contains('treasury.Deposit');
+    expect(eventStrings).to.contains('system.ExtrinsicSuccess');
   });
 });
--- a/tests/src/check-event/createMultipleItemsEvent.test.ts
+++ b/tests/src/check-event/createMultipleItemsEvent.test.ts
@@ -16,14 +16,11 @@
 
 // https://unique-network.readthedocs.io/en/latest/jsapi.html#setchainlimits
 import {IKeyringPair} from '@polkadot/types/types';
-import {getEventMessage} from '../util/helpers';
 import {usingPlaygrounds, itSub, expect} from '../util/playgrounds';
+import {IEvent} from '../util/playgrounds/types';
 
 describe('Create Multiple Items Event event ', () => {
   let alice: IKeyringPair;
-  const checkSection = 'ItemCreated';
-  const checkTreasury = 'Deposit';
-  const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       const donor = privateKey('//Alice');
@@ -38,9 +35,11 @@
       {owner: {Substrate: alice.address}},
     ]);
 
-    const msg = JSON.stringify(getEventMessage(helper.chainLog[helper.chainLog.length - 1].events));
-    expect(msg).to.be.contain(checkSection);
-    expect(msg).to.be.contain(checkTreasury);
-    expect(msg).to.be.contain(checkSystem);
+    const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
+    const eventStrings = event.map(e => `${e.section}.${e.method}`);
+
+    expect(eventStrings).to.contains('common.ItemCreated');
+    expect(eventStrings).to.contains('treasury.Deposit');
+    expect(eventStrings).to.contains('system.ExtrinsicSuccess');
   });
 });
--- a/tests/src/check-event/destroyCollectionEvent.test.ts
+++ b/tests/src/check-event/destroyCollectionEvent.test.ts
@@ -16,13 +16,11 @@
 
 // https://unique-network.readthedocs.io/en/latest/jsapi.html#setchainlimits
 import {IKeyringPair} from '@polkadot/types/types';
-import {getEventMessage} from '../util/helpers';
 import {itSub, usingPlaygrounds, expect} from '../util/playgrounds';
+import {IEvent} from '../util/playgrounds/types';
 
 describe('Destroy collection event ', () => {
   let alice: IKeyringPair;
-  const checkTreasury = 'Deposit';
-  const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       const donor = privateKey('//Alice');
@@ -33,8 +31,11 @@
   itSub('Check event from destroyCollection(): ', async ({helper}) => {
     const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
     await collection.burn(alice);
-    const msg = JSON.stringify(getEventMessage(helper.chainLog[helper.chainLog.length - 1].events));
-    expect(msg).to.be.contain(checkTreasury);
-    expect(msg).to.be.contain(checkSystem);
+    const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
+    const eventStrings = event.map(e => `${e.section}.${e.method}`);
+
+    expect(eventStrings).to.contains('common.CollectionDestroyed');
+    expect(eventStrings).to.contains('treasury.Deposit');
+    expect(eventStrings).to.contains('system.ExtrinsicSuccess');
   });
 });
--- a/tests/src/check-event/transferEvent.test.ts
+++ b/tests/src/check-event/transferEvent.test.ts
@@ -16,15 +16,12 @@
 
 // https://unique-network.readthedocs.io/en/latest/jsapi.html#setchainlimits
 import {IKeyringPair} from '@polkadot/types/types';
-import {getEventMessage} from '../util/helpers';
 import {usingPlaygrounds, expect, itSub} from '../util/playgrounds';
+import {IEvent} from '../util/playgrounds/types';
 
 describe('Transfer event ', () => {
   let alice: IKeyringPair;
   let bob: IKeyringPair;
-  const checkSection = 'Transfer';
-  const checkTreasury = 'Deposit';
-  const checkSystem = 'ExtrinsicSuccess';
 
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
@@ -37,9 +34,11 @@
     const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
     const token = await collection.mintToken(alice, {Substrate: alice.address});
     await token.transfer(alice, {Substrate: bob.address});
-    const msg = JSON.stringify(getEventMessage(helper.chainLog[helper.chainLog.length - 1].events));
-    expect(msg).to.be.contain(checkSection);
-    expect(msg).to.be.contain(checkTreasury);
-    expect(msg).to.be.contain(checkSystem);
+    const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
+    const eventStrings = event.map(e => `${e.section}.${e.method}`);
+
+    expect(eventStrings).to.contains('common.Transfer');
+    expect(eventStrings).to.contains('treasury.Deposit');
+    expect(eventStrings).to.contains('system.ExtrinsicSuccess');
   });
 });
--- a/tests/src/check-event/transferFromEvent.test.ts
+++ b/tests/src/check-event/transferFromEvent.test.ts
@@ -16,16 +16,12 @@
 
 // https://unique-network.readthedocs.io/en/latest/jsapi.html#setchainlimits
 import {IKeyringPair} from '@polkadot/types/types';
-import {getEventMessage} from '../util/helpers';
 import {usingPlaygrounds, expect, itSub} from '../util/playgrounds';
+import {IEvent} from '../util/playgrounds/types';
 
 describe('Transfer event ', () => {
   let alice: IKeyringPair;
   let bob: IKeyringPair;
-  const checkSection = 'Transfer';
-  const checkTreasury = 'Deposit';
-  const checkSystem = 'ExtrinsicSuccess';
-
   before(async () => {
     await usingPlaygrounds(async (helper, privateKey) => {
       const donor = privateKey('//Alice');
@@ -37,9 +33,11 @@
     const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
     const token = await collection.mintToken(alice, {Substrate: alice.address});
     await token.transferFrom(alice, {Substrate: alice.address}, {Substrate: bob.address});
-    const msg = JSON.stringify(getEventMessage(helper.chainLog[helper.chainLog.length - 1].events));
-    expect(msg).to.be.contain(checkSection);
-    expect(msg).to.be.contain(checkTreasury);
-    expect(msg).to.be.contain(checkSystem);
+    const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
+    const eventStrings = event.map(e => `${e.section}.${e.method}`);
+
+    expect(eventStrings).to.contains('common.Transfer');
+    expect(eventStrings).to.contains('treasury.Deposit');
+    expect(eventStrings).to.contains('system.ExtrinsicSuccess');
   });
 });

-- 
gitstuff