difftreelog
Remove asyncs without awaits
in: master
23 files changed
tests/src/addCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -56,8 +56,8 @@
const collection = await helper.collection.getData(collectionId);
expect(collection?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(alice.address));
- const changeAdminTxBob = async () => helper.collection.addAdmin(bob, collectionId, {Substrate: bob.address});
- const changeAdminTxCharlie = async () => helper.collection.addAdmin(bob, collectionId, {Substrate: charlie.address});
+ const changeAdminTxBob = () => helper.collection.addAdmin(bob, collectionId, {Substrate: bob.address});
+ const changeAdminTxCharlie = () => helper.collection.addAdmin(bob, collectionId, {Substrate: charlie.address});
await expect(changeAdminTxCharlie()).to.be.rejectedWith(/common\.NoPermission/);
await expect(changeAdminTxBob()).to.be.rejectedWith(/common\.NoPermission/);
@@ -75,7 +75,7 @@
const adminListAfterAddAdmin = await collection.getAdmins();
expect(adminListAfterAddAdmin).to.be.deep.contains({Substrate: bob.address});
- const changeAdminTxCharlie = async () => collection.addAdmin(bob, {Substrate: charlie.address});
+ const changeAdminTxCharlie = () => collection.addAdmin(bob, {Substrate: charlie.address});
await expect(changeAdminTxCharlie()).to.be.rejectedWith(/common\.NoPermission/);
const adminListAfterAddNewAdmin = await collection.getAdmins();
@@ -87,7 +87,7 @@
const [alice, bob] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);
const collectionId = (1 << 32) - 1;
- const addAdminTx = async () => helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});
+ const addAdminTx = () => helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});
await expect(addAdminTx()).to.be.rejectedWith(/common\.CollectionNotFound/);
// Verifying that nothing bad happened (network is live, new collections can be created, etc.)
@@ -99,7 +99,7 @@
const collection = await helper.nft.mintCollection(alice, {name: 'Collection Name', description: 'Collection Description', tokenPrefix: 'COL'});
await collection.burn(alice);
- const addAdminTx = async () => collection.addAdmin(alice, {Substrate: bob.address});
+ const addAdminTx = () => collection.addAdmin(alice, {Substrate: bob.address});
await expect(addAdminTx()).to.be.rejectedWith(/common\.CollectionNotFound/);
// Verifying that nothing bad happened (network is live, new collections can be created, etc.)
@@ -119,7 +119,7 @@
expect(adminListAfterAddAdmin).to.be.deep.contains({Substrate: accounts[i].address});
}
- const addExtraAdminTx = async () => collection.addAdmin(alice, {Substrate: accounts[chainAdminLimit].address});
+ const addExtraAdminTx = () => collection.addAdmin(alice, {Substrate: accounts[chainAdminLimit].address});
await expect(addExtraAdminTx()).to.be.rejectedWith(/common\.CollectionAdminCountExceeded/);
});
});
tests/src/adminTransferAndBurn.test.tsdiffbeforeafterboth--- a/tests/src/adminTransferAndBurn.test.ts
+++ b/tests/src/adminTransferAndBurn.test.ts
@@ -36,7 +36,7 @@
expect(limits.ownerCanTransfer).to.be.true;
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});
- const transferResult = async () => helper.nft.transferToken(alice, collectionId, tokenId, {Substrate: charlie.address});
+ const transferResult = () => helper.nft.transferToken(alice, collectionId, tokenId, {Substrate: charlie.address});
await expect(transferResult()).to.be.rejected;
await helper.nft.transferTokenFrom(alice, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address});
@@ -52,7 +52,7 @@
expect(limits.ownerCanTransfer).to.be.true;
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});
- const burnTxFailed = async () => helper.nft.burnToken(alice, collectionId, tokenId);
+ const burnTxFailed = () => helper.nft.burnToken(alice, collectionId, tokenId);
await expect(burnTxFailed()).to.be.rejected;
tests/src/allowLists.test.tsdiffbeforeafterboth--- a/tests/src/allowLists.test.ts
+++ b/tests/src/allowLists.test.ts
@@ -30,7 +30,7 @@
});
});
- describe('Positive', async () => {
+ describe('Positive', () => {
itSub('Owner can add address to allow list', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
// allow list does not need to be enabled to add someone in advance
@@ -58,7 +58,7 @@
});
});
- describe('Negative', async () => {
+ describe('Negative', () => {
itSub('Nobody can add address to allow list of non-existing collection', async ({helper}) => {
const collectionId = (1<<32) - 1;
await expect(helper.nft.addToAllowList(bob, collectionId, {Substrate: charlie.address}))
@@ -92,7 +92,7 @@
});
});
- describe('Positive', async () => {
+ describe('Positive', () => {
itSub('Owner can remove address from allow list', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await helper.nft.addToAllowList(alice, collectionId, {Substrate: bob.address});
@@ -128,7 +128,7 @@
});
});
- describe('Negative', async () => {
+ describe('Negative', () => {
itSub('Non-privileged user cannot remove address from allow list', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await helper.nft.addToAllowList(alice, collectionId, {Substrate: charlie.address});
@@ -168,7 +168,7 @@
});
});
- describe('Positive', async () => {
+ describe('Positive', () => {
itSub('If Public Access mode is set to AllowList, tokens can be transferred to a allowlisted address with transfer.', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});
@@ -219,7 +219,7 @@
});
});
- describe('Negative', async () => {
+ describe('Negative', () => {
itSub('If Public Access mode is set to AllowList, tokens can\'t be transferred from a non-allowlisted address with transfer or transferFrom. Test1', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});
@@ -303,7 +303,7 @@
{access: 'AllowList', mintMode: true},
];
- const testPermissionSuite = async (permissions: ICollectionPermissions) => {
+ const testPermissionSuite = (permissions: ICollectionPermissions) => {
const allowlistedMintingShouldFail = !permissions.mintMode!;
const appropriateRejectionMessage = permissions.mintMode! ? /common\.AddressNotInAllowlist/ : /common\.PublicMintingNotAllowed/;
@@ -323,8 +323,8 @@
);
- describe(`Public Access Mode = ${permissions.access}, Mint Mode = ${permissions.mintMode}`, async () => {
- describe('Positive', async () => {
+ describe(`Public Access Mode = ${permissions.access}, Mint Mode = ${permissions.mintMode}`, () => {
+ describe('Positive', () => {
itSub('With the condtions above, tokens can be created by owner', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {});
await collection.setPermissions(alice, permissions);
@@ -341,7 +341,7 @@
if (!allowlistedMintingShouldFail) allowlistedMintingTest();
});
- describe('Negative', async () => {
+ describe('Negative', () => {
itSub('With the condtions above, tokens can\'t be created by non-priviliged non-allow-listed address', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await collection.setPermissions(alice, permissions);
tests/src/approve.test.tsdiffbeforeafterboth--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -92,7 +92,7 @@
itSub('can`t be called by collection owner on non-owned item when OwnerCanTransfer == false', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});
- const approveTokenTx = async () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});
+ const approveTokenTx = () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});
await expect(approveTokenTx()).to.be.rejected;
});
});
@@ -196,7 +196,7 @@
await helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});
const owner = await helper.nft.getTokenOwner(collectionId, tokenId);
expect(owner.Substrate).to.be.equal(alice.address);
- const transferTokenFromTx = async () => helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});
+ const transferTokenFromTx = () => helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});
await expect(transferTokenFromTx()).to.be.rejected;
});
@@ -210,7 +210,7 @@
const after = await helper.ft.getBalance(collectionId, {Substrate: alice.address});
expect(after - before).to.be.equal(BigInt(1));
- const transferTokenFromTx = async () => helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);
+ const transferTokenFromTx = () => helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);
await expect(transferTokenFromTx()).to.be.rejected;
});
@@ -222,7 +222,7 @@
await helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 100n);
const after = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});
expect(after - before).to.be.equal(BigInt(100));
- const transferTokenFromTx = async () => helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 100n);
+ const transferTokenFromTx = () => helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 100n);
await expect(transferTokenFromTx()).to.be.rejected;
});
});
@@ -277,7 +277,7 @@
expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.true;
await helper.signTransaction(alice, helper.constructApiCall('api.tx.unique.approve', [{Substrate: bob.address}, collectionId, tokenId, 0]));
expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.false;
- const transferTokenFromTx = async () => helper.nft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: bob.address});
+ const transferTokenFromTx = () => helper.nft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: bob.address});
await expect(transferTokenFromTx()).to.be.rejected;
});
@@ -293,7 +293,7 @@
const amountAfter = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});
expect(amountAfter).to.be.equal(BigInt(0));
- const transferTokenFromTx = async () => helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 1n);
+ const transferTokenFromTx = () => helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 1n);
await expect(transferTokenFromTx()).to.be.rejected;
});
@@ -308,7 +308,7 @@
const amountAfter = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});
expect(amountAfter).to.be.equal(BigInt(0));
- const transferTokenFromTx = async () => helper.rft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 100n);
+ const transferTokenFromTx = () => helper.rft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 100n);
await expect(transferTokenFromTx()).to.be.rejected;
});
});
@@ -328,7 +328,7 @@
itSub('1 for NFT', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});
- const approveTx = async () => helper.signTransaction(bob, helper.constructApiCall('api.tx.unique.approve', [{Substrate: charlie.address}, collectionId, tokenId, 2]));
+ const approveTx = () => helper.signTransaction(bob, helper.constructApiCall('api.tx.unique.approve', [{Substrate: charlie.address}, collectionId, tokenId, 2]));
await expect(approveTx()).to.be.rejected;
expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: charlie.address})).to.be.false;
});
@@ -337,14 +337,14 @@
const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);
await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);
const tokenId = await helper.ft.getLastTokenId(collectionId);
- const approveTx = async () => helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 11n);
+ const approveTx = () => helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 11n);
await expect(approveTx()).to.be.rejected;
});
itSub.ifWithPallets('ReFungible', [Pallets.ReFungible], async ({helper}) => {
const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});
- const approveTx = async () => helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 101n);
+ const approveTx = () => helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 101n);
await expect(approveTx()).to.be.rejected;
});
});
@@ -483,7 +483,7 @@
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});
await helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});
- const approveTx = async () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});
+ const approveTx = () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});
await expect(approveTx()).to.be.rejected;
});
});
@@ -502,59 +502,59 @@
itSub('[nft] Approve for a collection that does not exist', async ({helper}) => {
const collectionId = 1 << 32 - 1;
- const approveTx = async () => helper.nft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});
+ const approveTx = () => helper.nft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});
await expect(approveTx()).to.be.rejected;
});
itSub('[fungible] Approve for a collection that does not exist', async ({helper}) => {
const collectionId = 1 << 32 - 1;
- const approveTx = async () => helper.ft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});
+ const approveTx = () => helper.ft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});
await expect(approveTx()).to.be.rejected;
});
itSub.ifWithPallets('[refungible] Approve for a collection that does not exist', [Pallets.ReFungible], async ({helper}) => {
const collectionId = 1 << 32 - 1;
- const approveTx = async () => helper.rft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});
+ const approveTx = () => helper.rft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});
await expect(approveTx()).to.be.rejected;
});
itSub('[nft] Approve for a collection that was destroyed', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await helper.nft.burn(alice, collectionId);
- const approveTx = async () => helper.nft.approveToken(alice, collectionId, 1, {Substrate: bob.address});
+ const approveTx = () => helper.nft.approveToken(alice, collectionId, 1, {Substrate: bob.address});
await expect(approveTx()).to.be.rejected;
});
itSub('[fungible] Approve for a collection that was destroyed', async ({helper}) => {
const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await helper.ft.burn(alice, collectionId);
- const approveTx = async () => helper.ft.approveToken(alice, collectionId, 1, {Substrate: bob.address});
+ const approveTx = () => helper.ft.approveToken(alice, collectionId, 1, {Substrate: bob.address});
await expect(approveTx()).to.be.rejected;
});
itSub.ifWithPallets('[refungible] Approve for a collection that was destroyed', [Pallets.ReFungible], async ({helper}) => {
const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await helper.rft.burn(alice, collectionId);
- const approveTx = async () => helper.rft.approveToken(alice, collectionId, 1, {Substrate: bob.address});
+ const approveTx = () => helper.rft.approveToken(alice, collectionId, 1, {Substrate: bob.address});
await expect(approveTx()).to.be.rejected;
});
itSub('[nft] Approve transfer of a token that does not exist', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const approveTx = async () => helper.nft.approveToken(alice, collectionId, 2, {Substrate: bob.address});
+ const approveTx = () => helper.nft.approveToken(alice, collectionId, 2, {Substrate: bob.address});
await expect(approveTx()).to.be.rejected;
});
itSub.ifWithPallets('[refungible] Approve transfer of a token that does not exist', [Pallets.ReFungible], async ({helper}) => {
const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const approveTx = async () => helper.rft.approveToken(alice, collectionId, 2, {Substrate: bob.address});
+ const approveTx = () => helper.rft.approveToken(alice, collectionId, 2, {Substrate: bob.address});
await expect(approveTx()).to.be.rejected;
});
itSub('[nft] Approve using the address that does not own the approved token', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});
- const approveTx = async () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});
+ const approveTx = () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});
await expect(approveTx()).to.be.rejected;
});
@@ -562,14 +562,14 @@
const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);
const tokenId = await helper.ft.getLastTokenId(collectionId);
- const approveTx = async () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});
+ const approveTx = () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});
await expect(approveTx()).to.be.rejected;
});
itSub.ifWithPallets('[refungible] Approve using the address that does not own the approved token', [Pallets.ReFungible], async ({helper}) => {
const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});
- const approveTx = async () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});
+ const approveTx = () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});
await expect(approveTx()).to.be.rejected;
});
@@ -579,7 +579,7 @@
await helper.rft.transferToken(alice, collectionId, tokenId, {Substrate: bob.address}, 100n);
await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 100n);
- const approveTx = async () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 101n);
+ const approveTx = () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 101n);
await expect(approveTx()).to.be.rejected;
});
@@ -590,7 +590,7 @@
await helper.ft.transferToken(alice, collectionId, tokenId, {Substrate: bob.address}, 10n);
await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 10n);
- const approveTx = async () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 11n);
+ const approveTx = () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 11n);
await expect(approveTx()).to.be.rejected;
});
@@ -599,7 +599,7 @@
const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});
await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: false});
- const approveTx = async () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});
+ const approveTx = () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});
await expect(approveTx()).to.be.rejected;
});
});
tests/src/change-collection-owner.test.tsdiffbeforeafterboth--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -56,7 +56,7 @@
await collection.changeOwner(alice, bob.address);
- const changeOwnerTx = async () => collection.changeOwner(alice, alice.address);
+ const changeOwnerTx = () => collection.changeOwner(alice, alice.address);
await expect(changeOwnerTx()).to.be.rejectedWith(/common\.NoPermission/);
const afterChanging = await helper.collection.getData(collection.collectionId);
@@ -115,20 +115,20 @@
itSub('Not owner can\'t change owner.', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const changeOwnerTx = async () => collection.changeOwner(bob, bob.address);
+ const changeOwnerTx = () => collection.changeOwner(bob, bob.address);
await expect(changeOwnerTx()).to.be.rejectedWith(/common\.NoPermission/);
});
itSub('Collection admin can\'t change owner.', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await collection.addAdmin(alice, {Substrate: bob.address});
- const changeOwnerTx = async () => collection.changeOwner(bob, bob.address);
+ const changeOwnerTx = () => collection.changeOwner(bob, bob.address);
await expect(changeOwnerTx()).to.be.rejectedWith(/common\.NoPermission/);
});
itSub('Can\'t change owner of a non-existing collection.', async ({helper}) => {
const collectionId = (1 << 32) - 1;
- const changeOwnerTx = async () => helper.collection.changeOwner(bob, collectionId, bob.address);
+ const changeOwnerTx = () => helper.collection.changeOwner(bob, collectionId, bob.address);
await expect(changeOwnerTx()).to.be.rejectedWith(/common\.CollectionNotFound/);
});
@@ -136,15 +136,15 @@
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await collection.changeOwner(alice, bob.address);
- const changeOwnerTx = async () => collection.changeOwner(alice, alice.address);
+ const changeOwnerTx = () => collection.changeOwner(alice, alice.address);
await expect(changeOwnerTx()).to.be.rejectedWith(/common\.NoPermission/);
const afterChanging = await helper.collection.getData(collection.collectionId);
expect(afterChanging?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(bob.address));
- const setSponsorTx = async () => collection.setSponsor(alice, charlie.address);
- const confirmSponsorshipTx = async () => collection.confirmSponsorship(alice);
- const removeSponsorTx = async () => collection.removeSponsor(alice);
+ const setSponsorTx = () => collection.setSponsor(alice, charlie.address);
+ const confirmSponsorshipTx = () => collection.confirmSponsorship(alice);
+ const removeSponsorTx = () => collection.removeSponsor(alice);
await expect(setSponsorTx()).to.be.rejectedWith(/common\.NoPermission/);
await expect(confirmSponsorshipTx()).to.be.rejectedWith(/unique\.ConfirmUnsetSponsorFail/);
await expect(removeSponsorTx()).to.be.rejectedWith(/common\.NoPermission/);
@@ -157,13 +157,13 @@
ownerCanTransfer: true,
};
- const setLimitsTx = async () => collection.setLimits(alice, limits);
+ const setLimitsTx = () => collection.setLimits(alice, limits);
await expect(setLimitsTx()).to.be.rejectedWith(/common\.NoPermission/);
- const setPermissionTx = async () => collection.setPermissions(alice, {access: 'AllowList', mintMode: true});
+ const setPermissionTx = () => collection.setPermissions(alice, {access: 'AllowList', mintMode: true});
await expect(setPermissionTx()).to.be.rejectedWith(/common\.NoPermission/);
- const burnTx = async () => collection.burn(alice);
+ const burnTx = () => collection.burn(alice);
await expect(burnTx()).to.be.rejectedWith(/common\.NoPermission/);
});
});
tests/src/confirmSponsorship.test.tsdiffbeforeafterboth--- a/tests/src/confirmSponsorship.test.ts
+++ b/tests/src/confirmSponsorship.test.ts
@@ -119,7 +119,7 @@
await token.transfer(alice, {Substrate: zeroBalance.address});
const bobBalanceBefore = await helper.balance.getSubstrate(bob.address);
- const transferTx = async () => token.transfer(zeroBalance, {Substrate: alice.address});
+ const transferTx = () => token.transfer(zeroBalance, {Substrate: alice.address});
await expect(transferTx()).to.be.rejectedWith('Inability to pay some fees');
const bobBalanceAfter = await helper.balance.getSubstrate(bob.address);
@@ -137,7 +137,7 @@
await collection.transfer(zeroBalance, {Substrate: zeroBalance.address}, 1n);
const bobBalanceBefore = await helper.balance.getSubstrate(bob.address);
- const transferTx = async () => collection.transfer(zeroBalance, {Substrate: zeroBalance.address});
+ const transferTx = () => collection.transfer(zeroBalance, {Substrate: zeroBalance.address});
await expect(transferTx()).to.be.rejected;
const bobBalanceAfter = await helper.balance.getSubstrate(bob.address);
@@ -155,7 +155,7 @@
await token.transfer(zeroBalance, {Substrate: alice.address});
const bobBalanceBefore = await helper.balance.getSubstrate(bob.address);
- const transferTx = async () => token.transfer(zeroBalance, {Substrate: alice.address});
+ const transferTx = () => token.transfer(zeroBalance, {Substrate: alice.address});
await expect(transferTx()).to.be.rejectedWith('Inability to pay some fees');
const bobBalanceAfter = await helper.balance.getSubstrate(bob.address);
@@ -175,7 +175,7 @@
await collection.mintToken(zeroBalance, {Substrate: zeroBalance.address});
const bobBalanceBefore = await helper.balance.getSubstrate(bob.address);
- const mintTx = async () => collection.mintToken(zeroBalance, {Substrate: zeroBalance.address});
+ const mintTx = () => collection.mintToken(zeroBalance, {Substrate: zeroBalance.address});
await expect(mintTx()).to.be.rejectedWith('Inability to pay some fees');
const bobBalanceAfter = await helper.balance.getSubstrate(bob.address);
@@ -199,21 +199,21 @@
itSub('(!negative test!) Confirm sponsorship for a collection that never existed', async ({helper}) => {
const collectionId = (1 << 32) - 1;
- const confirmSponsorshipTx = async () => helper.collection.confirmSponsorship(bob, collectionId);
+ const confirmSponsorshipTx = () => helper.collection.confirmSponsorship(bob, collectionId);
await expect(confirmSponsorshipTx()).to.be.rejectedWith(/common\.CollectionNotFound/);
});
itSub('(!negative test!) Confirm sponsorship using a non-sponsor address', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await collection.setSponsor(alice, bob.address);
- const confirmSponsorshipTx = async () => collection.confirmSponsorship(charlie);
+ const confirmSponsorshipTx = () => collection.confirmSponsorship(charlie);
await expect(confirmSponsorshipTx()).to.be.rejectedWith(/unique\.ConfirmUnsetSponsorFail/);
});
itSub('(!negative test!) Confirm sponsorship using owner address', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await collection.setSponsor(alice, bob.address);
- const confirmSponsorshipTx = async () => collection.confirmSponsorship(alice);
+ const confirmSponsorshipTx = () => collection.confirmSponsorship(alice);
await expect(confirmSponsorshipTx()).to.be.rejectedWith(/unique\.ConfirmUnsetSponsorFail/);
});
@@ -221,20 +221,20 @@
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await collection.setSponsor(alice, bob.address);
await collection.addAdmin(alice, {Substrate: charlie.address});
- const confirmSponsorshipTx = async () => collection.confirmSponsorship(charlie);
+ const confirmSponsorshipTx = () => collection.confirmSponsorship(charlie);
await expect(confirmSponsorshipTx()).to.be.rejectedWith(/unique\.ConfirmUnsetSponsorFail/);
});
itSub('(!negative test!) Confirm sponsorship without sponsor being set with setCollectionSponsor', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const confirmSponsorshipTx = async () => collection.confirmSponsorship(charlie);
+ const confirmSponsorshipTx = () => collection.confirmSponsorship(charlie);
await expect(confirmSponsorshipTx()).to.be.rejectedWith(/unique\.ConfirmUnsetSponsorFail/);
});
itSub('(!negative test!) Confirm sponsorship in a collection that was destroyed', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
await collection.burn(alice);
- const confirmSponsorshipTx = async () => collection.confirmSponsorship(charlie);
+ const confirmSponsorshipTx = () => collection.confirmSponsorship(charlie);
await expect(confirmSponsorshipTx()).to.be.rejectedWith(/common\.CollectionNotFound/);
});
@@ -244,7 +244,7 @@
await collection.confirmSponsorship(bob);
const token = await collection.mintToken(alice, {Substrate: ownerZeroBalance.address});
const sponsorBalanceBefore = await helper.balance.getSubstrate(bob.address);
- const transferTx = async () => token.transfer(senderZeroBalance, {Substrate: alice.address});
+ const transferTx = () => token.transfer(senderZeroBalance, {Substrate: alice.address});
await expect(transferTx()).to.be.rejectedWith('Inability to pay some fees');
const sponsorBalanceAfter = await helper.balance.getSubstrate(bob.address);
expect(sponsorBalanceAfter).to.equal(sponsorBalanceBefore);
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -116,20 +116,20 @@
});
itSub('(!negative test!) create new NFT collection whith incorrect data (collection_name)', async ({helper}) => {
- const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'A'.repeat(65), description: 'descr', tokenPrefix: 'COL'});
+ const mintCollectionTx = () => helper.nft.mintCollection(alice, {name: 'A'.repeat(65), description: 'descr', tokenPrefix: 'COL'});
await expect(mintCollectionTx()).to.be.rejectedWith('Verification Error');
});
itSub('(!negative test!) create new NFT collection whith incorrect data (collection_description)', async ({helper}) => {
- const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'name', description: 'A'.repeat(257), tokenPrefix: 'COL'});
+ const mintCollectionTx = () => helper.nft.mintCollection(alice, {name: 'name', description: 'A'.repeat(257), tokenPrefix: 'COL'});
await expect(mintCollectionTx()).to.be.rejectedWith('Verification Error');
});
itSub('(!negative test!) create new NFT collection whith incorrect data (token_prefix)', async ({helper}) => {
- const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'A'.repeat(17)});
+ const mintCollectionTx = () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'A'.repeat(17)});
await expect(mintCollectionTx()).to.be.rejectedWith('Verification Error');
});
itSub('(!negative test!) fails when bad limits are set', async ({helper}) => {
- const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL', limits: {tokenLimit: 0}});
+ const mintCollectionTx = () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL', limits: {tokenLimit: 0}});
await expect(mintCollectionTx()).to.be.rejectedWith(/common\.CollectionTokenLimitExceeded/);
});
@@ -139,7 +139,7 @@
for (let i = 0; i < 65; i++) {
props.push({key: `key${i}`, value: `value${i}`});
}
- const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL', properties: props});
+ const mintCollectionTx = () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL', properties: props});
await expect(mintCollectionTx()).to.be.rejectedWith('Verification Error');
});
@@ -150,7 +150,7 @@
props.push({key: `key${i}`.repeat(80), value: `value${i}`.repeat(80)});
}
- const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL', properties: props});
+ const mintCollectionTx = () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL', properties: props});
await expect(mintCollectionTx()).to.be.rejectedWith('Verification Error');
});
});
tests/src/createItem.test.tsdiffbeforeafterboth--- a/tests/src/createItem.test.ts
+++ b/tests/src/createItem.test.ts
@@ -186,17 +186,17 @@
itSub('Regular user cannot create new item in NFT collection', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const mintTx = async () => collection.mintToken(bob, {Substrate: bob.address});
+ const mintTx = () => collection.mintToken(bob, {Substrate: bob.address});
await expect(mintTx()).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);
});
itSub('Regular user cannot create new item in Fungible collection', async ({helper}) => {
const collection = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);
- const mintTx = async () => collection.mint(bob, 10n, {Substrate: bob.address});
+ const mintTx = () => collection.mint(bob, 10n, {Substrate: bob.address});
await expect(mintTx()).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);
});
itSub.ifWithPallets('Regular user cannot create new item in ReFungible collection', [Pallets.ReFungible], async ({helper}) => {
const collection = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const mintTx = async () => collection.mintToken(bob, 100n, {Substrate: bob.address});
+ const mintTx = () => collection.mintToken(bob, 100n, {Substrate: bob.address});
await expect(mintTx()).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);
});
@@ -204,7 +204,7 @@
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL',
tokenPropertyPermissions: [{key: 'k', permission: {mutable: false, collectionAdmin: false, tokenOwner: false}}],
});
- const mintTx = async () => collection.mintToken(alice, {Substrate: bob.address}, [{key: 'k', value: 'v'}]);
+ const mintTx = () => collection.mintToken(alice, {Substrate: bob.address}, [{key: 'k', value: 'v'}]);
await expect(mintTx()).to.be.rejectedWith(/common\.NoPermission/);
});
@@ -212,13 +212,13 @@
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL',
tokenPropertyPermissions: [{key: 'k', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}],
});
- const mintTx = async () => collection.mintToken(alice, {Substrate: bob.address}, [{key: 'k', value: 'v'}]);
+ const mintTx = () => collection.mintToken(alice, {Substrate: bob.address}, [{key: 'k', value: 'v'}]);
await expect(mintTx()).to.be.rejectedWith(/common\.NoPermission/);
});
itSub('Adding property without access rights', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const mintTx = async () => collection.mintToken(alice, {Substrate: bob.address}, [{key: 'k', value: 'v'}]);
+ const mintTx = () => collection.mintToken(alice, {Substrate: bob.address}, [{key: 'k', value: 'v'}]);
await expect(mintTx()).to.be.rejectedWith(/common\.NoPermission/);
});
@@ -231,7 +231,7 @@
const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const mintTx = async () => collection.mintToken(alice, {Substrate: bob.address}, props);
+ const mintTx = () => collection.mintToken(alice, {Substrate: bob.address}, props);
await expect(mintTx()).to.be.rejectedWith('Verification Error');
});
@@ -242,7 +242,7 @@
{key: 'k2', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}},
],
});
- const mintTx = async () => collection.mintToken(alice, {Substrate: bob.address}, [
+ const mintTx = () => collection.mintToken(alice, {Substrate: bob.address}, [
{key: 'k1', value: 'vvvvvv'.repeat(5000)},
{key: 'k2', value: 'vvv'.repeat(5000)},
]);
tests/src/createMultipleItems.test.tsdiffbeforeafterboth--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -183,7 +183,7 @@
{},
{},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(bob, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(bob, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);
});
@@ -198,7 +198,7 @@
{value: 2n},
{value: 3n},
];
- const mintTx = async () => helper.ft.mintMultipleTokensWithOneOwner(bob, collection.collectionId, args, {Substrate: alice.address});
+ const mintTx = () => helper.ft.mintMultipleTokensWithOneOwner(bob, collection.collectionId, args, {Substrate: alice.address});
await expect(mintTx()).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);
});
@@ -213,7 +213,7 @@
{pieces: 1n},
{pieces: 1n},
];
- const mintTx = async () => helper.rft.mintMultipleTokensWithOneOwner(bob, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.rft.mintMultipleTokensWithOneOwner(bob, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);
});
@@ -223,7 +223,7 @@
{},
{},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(bob, collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(bob, collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith(/common\.CollectionNotFound/);
});
@@ -241,7 +241,7 @@
{properties: [{key: 'data', value: 'B'.repeat(32769)}]},
{properties: [{key: 'data', value: 'C'.repeat(32769)}]},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith('Verification Error');
});
@@ -259,7 +259,7 @@
{pieces: 10n, properties: [{key: 'data', value: 'B'.repeat(32769)}]},
{pieces: 10n, properties: [{key: 'data', value: 'C'.repeat(32769)}]},
];
- const mintTx = async () => helper.rft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.rft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith('Verification Error');
});
@@ -291,7 +291,7 @@
{properties: [{key: 'data', value: 'A'}]},
{properties: [{key: 'data', value: 'B'.repeat(32769)}]},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith('Verification Error');
});
@@ -311,7 +311,7 @@
{},
{},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith(/common\.CollectionTokenLimitExceeded/);
});
@@ -327,7 +327,7 @@
const args = [
{properties: [{key: 'data', value: 'A'}]},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith(/common\.NoPermission/);
});
@@ -346,7 +346,7 @@
const args = [
{properties: [{key: 'data', value: 'A'}]},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith(/common\.NoPermission/);
});
@@ -368,7 +368,7 @@
{properties: prps},
];
- const mintTx = async () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
+ const mintTx = () => helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
await expect(mintTx()).to.be.rejectedWith('Verification Error');
});
});
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -69,7 +69,7 @@
});
});
-describe('ERC165 tests', async () => {
+describe('ERC165 tests', () => {
// https://eips.ethereum.org/EIPS/eip-165
let erc721MetadataCompatibleNftCollectionId: number;
tests/src/eth/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -81,7 +81,7 @@
});
});
- describe('Negative Test: EVM Nesting', async() => {
+ describe('Negative Test: EVM Nesting', () => {
itEth('NFT: disallows to nest token if nesting is disabled', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/util/index.tsdiffbeforeafterboth--- a/tests/src/eth/util/index.ts
+++ b/tests/src/eth/util/index.ts
@@ -58,7 +58,7 @@
}
};
-export async function itEth(name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export function itEth(name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
(opts.only ? it.only :
opts.skip ? it.skip : it)(name, async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
@@ -71,7 +71,7 @@
});
}
-export async function itEthIfWithPallet(name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export function itEthIfWithPallet(name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
return itEth(name, cb, {requiredPallets: required, ...opts});
}
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -367,7 +367,7 @@
return this.web3;
}
- async connectWeb3(wsEndpoint: string) {
+ connectWeb3(wsEndpoint: string) {
if(this.web3 !== null) return;
this.web3Provider = new Web3.providers.WebsocketProvider(wsEndpoint);
this.web3 = new Web3(this.web3Provider);
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -83,15 +83,15 @@
});
});
- itSub('Required pallets are present', async ({helper}) => {
+ itSub('Required pallets are present', ({helper}) => {
expect(helper.fetchAllPalletNames()).to.contain.members([...requiredPallets]);
});
- itSub('Governance and consensus pallets are present', async ({helper}) => {
+ itSub('Governance and consensus pallets are present', ({helper}) => {
expect(helper.fetchAllPalletNames()).to.contain.members([...consensusPallets]);
});
- itSub('No extra pallets are included', async ({helper}) => {
+ itSub('No extra pallets are included', ({helper}) => {
expect(helper.fetchAllPalletNames().sort()).to.be.deep.equal([...requiredPallets, ...consensusPallets].sort());
});
});
tests/src/refungible.test.tsdiffbeforeafterboth--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -19,7 +19,7 @@
const MAX_REFUNGIBLE_PIECES = 1_000_000_000_000_000_000_000n;
-describe('integration test: Refungible functionality:', async () => {
+describe('integration test: Refungible functionality:', () => {
let donor: IKeyringPair;
let alice: IKeyringPair;
let bob: IKeyringPair;
tests/src/rmrk/addResource.seqtest.tsdiffbeforeafterboth--- a/tests/src/rmrk/addResource.seqtest.ts
+++ b/tests/src/rmrk/addResource.seqtest.ts
@@ -112,7 +112,7 @@
const resourcesInfo = [];
const resourceNum = 4;
- const checkResource = async (resource: ResourceInfo, resType: string, expectedId: number, expected: {
+ const checkResource = (resource: ResourceInfo, resType: string, expectedId: number, expected: {
src: string,
metadata: string,
license: string,
tests/src/rmrk/equipNft.seqtest.tsdiffbeforeafterboth--- a/tests/src/rmrk/equipNft.seqtest.ts
+++ b/tests/src/rmrk/equipNft.seqtest.ts
@@ -30,7 +30,7 @@
const slotId = 1;
-async function createTestCollection(api: ApiPromise): Promise<number> {
+function createTestCollection(api: ApiPromise): Promise<number> {
return createCollection(
api,
alice,
@@ -60,7 +60,7 @@
return nftChildId;
}
-async function createTestBase(api: ApiPromise): Promise<number> {
+function createTestBase(api: ApiPromise): Promise<number> {
return createBase(api, alice, 'test-base', 'DTBase', [
{
SlotPart: {
tests/src/rmrk/rmrkIsolation.seqtest.tsdiffbeforeafterboth--- a/tests/src/rmrk/rmrkIsolation.seqtest.ts
+++ b/tests/src/rmrk/rmrkIsolation.seqtest.ts
@@ -58,7 +58,7 @@
return rmrkNftId;
}
-describe('RMRK External Integration Test', async () => {
+describe('RMRK External Integration Test', () => {
before(async function() {
await usingPlaygrounds(async (_helper, privateKey) => {
alice = await privateKey('//Alice');
@@ -78,7 +78,7 @@
});
});
-describe('Negative Integration Test: External Collections, Internal Ops', async () => {
+describe('Negative Integration Test: External Collections, Internal Ops', () => {
let uniqueCollectionId: number;
let rmrkCollectionId: number;
let rmrkNftId: number;
@@ -196,7 +196,7 @@
});
});
-describe('Negative Integration Test: Internal Collections, External Ops', async () => {
+describe('Negative Integration Test: Internal Collections, External Ops', () => {
let collectionId: number;
let nftId: number;
tests/src/rmrk/util/fetch.tsdiffbeforeafterboth--- a/tests/src/rmrk/util/fetch.ts
+++ b/tests/src/rmrk/util/fetch.ts
@@ -20,7 +20,7 @@
return (await api.rpc.rmrk.lastCollectionIdx()).toNumber();
}
-export async function getCollection(api: ApiPromise, id: number): Promise<Option<Collection>> {
+export function getCollection(api: ApiPromise, id: number): Promise<Option<Collection>> {
return api.rpc.rmrk.collectionById(id);
}
@@ -36,7 +36,7 @@
.map((value) => value.toNumber());
}
-export async function getNft(api: ApiPromise, collectionId: number, nftId: number): Promise<Option<Nft>> {
+export function getNft(api: ApiPromise, collectionId: number, nftId: number): Promise<Option<Nft>> {
return api.rpc.rmrk.nftById(collectionId, nftId);
}
@@ -56,7 +56,7 @@
return (await api.rpc.rmrk.nftChildren(collectionId, nftId)).toArray();
}
-export async function getBase(api: ApiPromise, baseId: number): Promise<Option<Base>> {
+export function getBase(api: ApiPromise, baseId: number): Promise<Option<Base>> {
return api.rpc.rmrk.base(baseId);
}
@@ -112,7 +112,7 @@
.map((name) => name.toUtf8());
}
-export async function getTheme(
+export function getTheme(
api: ApiPromise,
baseId: number,
themeName: string,
tests/src/tx-version-presence.test.tsdiffbeforeafterboth--- a/tests/src/tx-version-presence.test.ts
+++ b/tests/src/tx-version-presence.test.ts
@@ -26,7 +26,7 @@
});
});
- itSub('Signed extension CheckTxVersion is present', async () => {
+ itSub('Signed extension CheckTxVersion is present', () => {
expect(metadata.asLatest.extrinsic.signedExtensions.map(se => se.identifier.toString())).to.include('CheckTxVersion');
});
});
tests/src/util/globalSetup.tsdiffbeforeafterboth--- a/tests/src/util/globalSetup.ts
+++ b/tests/src/util/globalSetup.ts
@@ -90,7 +90,7 @@
});
};
-const fundFilenamesWithRetries = async (retriesLeft: number): Promise<boolean> => {
+const fundFilenamesWithRetries = (retriesLeft: number): Promise<boolean> => {
if (retriesLeft <= 0) return Promise.resolve(false);
return fundFilenames()
.then(() => Promise.resolve(true))
tests/src/util/index.tsdiffbeforeafterboth--- a/tests/src/util/index.ts
+++ b/tests/src/util/index.ts
@@ -59,27 +59,27 @@
return usingPlaygroundsGeneral<DevUniqueHelper>(DevUniqueHelper, url, code);
};
-export const usingWestmintPlaygrounds = async (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+export const usingWestmintPlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
return usingPlaygroundsGeneral<DevWestmintHelper>(DevWestmintHelper, url, code);
};
-export const usingRelayPlaygrounds = async (url: string, code: (helper: DevRelayHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+export const usingRelayPlaygrounds = (url: string, code: (helper: DevRelayHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
return usingPlaygroundsGeneral<DevRelayHelper>(DevRelayHelper, url, code);
};
-export const usingAcalaPlaygrounds = async (url: string, code: (helper: DevAcalaHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+export const usingAcalaPlaygrounds = (url: string, code: (helper: DevAcalaHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
return usingPlaygroundsGeneral<DevAcalaHelper>(DevAcalaHelper, url, code);
};
-export const usingKaruraPlaygrounds = async (url: string, code: (helper: DevKaruraHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+export const usingKaruraPlaygrounds = (url: string, code: (helper: DevKaruraHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
return usingPlaygroundsGeneral<DevKaruraHelper>(DevAcalaHelper, url, code);
};
-export const usingMoonbeamPlaygrounds = async (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+export const usingMoonbeamPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
return usingPlaygroundsGeneral<DevMoonbeamHelper>(DevMoonbeamHelper, url, code);
};
-export const usingMoonriverPlaygrounds = async (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+export const usingMoonriverPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
return usingPlaygroundsGeneral<DevMoonriverHelper>(DevMoonriverHelper, url, code);
};
@@ -107,7 +107,7 @@
}
}
-export async function itSub(name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export function itSub(name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
(opts.only ? it.only :
opts.skip ? it.skip : it)(name, async function () {
await usingPlaygrounds(async (helper, privateKey) => {
@@ -119,7 +119,7 @@
});
});
}
-export async function itSubIfWithPallet(name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export function itSubIfWithPallet(name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
return itSub(name, cb, {requiredPallets: required, ...opts});
}
itSub.only = (name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSub(name, cb, {only: true});
@@ -129,7 +129,7 @@
itSubIfWithPallet.skip = (name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSubIfWithPallet(name, required, cb, {skip: true});
itSub.ifWithPallets = itSubIfWithPallet;
-export async function describeXCM(title: string, fn: (this: Mocha.Suite) => void, opts: {skip?: boolean} = {}) {
+export function describeXCM(title: string, fn: (this: Mocha.Suite) => void, opts: {skip?: boolean} = {}) {
(process.env.RUN_XCM_TESTS && !opts.skip
? describe
: describe.skip)(title, fn);
tests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {stringToU8a} from '@polkadot/util';5import {encodeAddress, mnemonicGenerate} from '@polkadot/util-crypto';6import {UniqueHelper, MoonbeamHelper, ChainHelperBase, AcalaHelper, RelayHelper, WestmintHelper} from './unique';7import {ApiPromise, Keyring, WsProvider} from '@polkadot/api';8import * as defs from '../../interfaces/definitions';9import {IKeyringPair} from '@polkadot/types/types';10import {EventRecord} from '@polkadot/types/interfaces';11import {ICrossAccountId} from './types';12import {FrameSystemEventRecord} from '@polkadot/types/lookup';1314export class SilentLogger {15 log(_msg: any, _level: any): void { }16 level = {17 ERROR: 'ERROR' as const,18 WARNING: 'WARNING' as const,19 INFO: 'INFO' as const,20 };21}2223export class SilentConsole {24 // TODO: Remove, this is temporary: Filter unneeded API output25 // (Jaco promised it will be removed in the next version)26 consoleErr: any;27 consoleLog: any;28 consoleWarn: any;2930 constructor() {31 this.consoleErr = console.error;32 this.consoleLog = console.log;33 this.consoleWarn = console.warn;34 }3536 enable() { 37 const outFn = (printer: any) => (...args: any[]) => {38 for (const arg of args) {39 if (typeof arg !== 'string')40 continue;41 if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis:') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')42 return;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}5859export class DevUniqueHelper extends UniqueHelper {60 /**61 * Arrange methods for tests62 */63 arrange: ArrangeGroup;64 wait: WaitGroup;65 admin: AdminGroup;6667 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {68 options.helperBase = options.helperBase ?? DevUniqueHelper;6970 super(logger, options);71 this.arrange = new ArrangeGroup(this);72 this.wait = new WaitGroup(this);73 this.admin = new AdminGroup(this);74 }7576 async connect(wsEndpoint: string, _listeners?: any): Promise<void> {77 const wsProvider = new WsProvider(wsEndpoint);78 this.api = new ApiPromise({79 provider: wsProvider,80 signedExtensions: {81 ContractHelpers: {82 extrinsic: {},83 payload: {},84 },85 FakeTransactionFinalizer: {86 extrinsic: {},87 payload: {},88 },89 },90 rpc: {91 unique: defs.unique.rpc,92 appPromotion: defs.appPromotion.rpc,93 rmrk: defs.rmrk.rpc,94 eth: {95 feeHistory: {96 description: 'Dummy',97 params: [],98 type: 'u8',99 },100 maxPriorityFeePerGas: {101 description: 'Dummy',102 params: [],103 type: 'u8',104 },105 },106 },107 });108 await this.api.isReadyOrError;109 this.network = await UniqueHelper.detectNetwork(this.api);110 }111}112113export class DevRelayHelper extends RelayHelper {}114115export class DevWestmintHelper extends WestmintHelper {116 wait: WaitGroup;117118 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {119 options.helperBase = options.helperBase ?? DevWestmintHelper;120121 super(logger, options);122 this.wait = new WaitGroup(this);123 }124}125126export class DevMoonbeamHelper extends MoonbeamHelper {127 account: MoonbeamAccountGroup;128 wait: WaitGroup;129130 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {131 options.helperBase = options.helperBase ?? DevMoonbeamHelper;132133 super(logger, options);134 this.account = new MoonbeamAccountGroup(this);135 this.wait = new WaitGroup(this);136 }137}138139export class DevMoonriverHelper extends DevMoonbeamHelper {}140141export class DevAcalaHelper extends AcalaHelper {142 wait: WaitGroup;143144 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {145 options.helperBase = options.helperBase ?? DevAcalaHelper;146147 super(logger, options);148 this.wait = new WaitGroup(this);149 }150}151152export class DevKaruraHelper extends DevAcalaHelper {}153154class ArrangeGroup {155 helper: DevUniqueHelper;156157 constructor(helper: DevUniqueHelper) {158 this.helper = helper;159 }160161 /**162 * Generates accounts with the specified UNQ token balance 163 * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.164 * @param donor donor account for balances165 * @returns array of newly created accounts166 * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 167 */168 createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {169 let nonce = await this.helper.chain.getNonce(donor.address);170 const wait = new WaitGroup(this.helper);171 const ss58Format = this.helper.chain.getChainProperties().ss58Format;172 const tokenNominal = this.helper.balance.getOneTokenNominal();173 const transactions = [];174 const accounts: IKeyringPair[] = [];175 for (const balance of balances) {176 const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);177 accounts.push(recipient);178 if (balance !== 0n) {179 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);180 transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));181 nonce++;182 }183 }184185 await Promise.all(transactions).catch(_e => {});186 187 //#region TODO remove this region, when nonce problem will be solved188 const checkBalances = async () => {189 let isSuccess = true;190 for (let i = 0; i < balances.length; i++) {191 const balance = await this.helper.balance.getSubstrate(accounts[i].address);192 if (balance !== balances[i] * tokenNominal) {193 isSuccess = false;194 break;195 }196 }197 return isSuccess;198 };199200 let accountsCreated = false;201 const maxBlocksChecked = await this.helper.arrange.isDevNode() ? 50 : 5;202 // checkBalances retry up to 5-50 blocks203 for (let index = 0; index < maxBlocksChecked; index++) {204 accountsCreated = await checkBalances();205 if(accountsCreated) break;206 await wait.newBlocks(1);207 }208209 if (!accountsCreated) throw Error('Accounts generation failed');210 //#endregion211212 return accounts;213 };214215 // TODO combine this method and createAccounts into one216 createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => { 217 const createAsManyAsCan = async () => {218 let transactions: any = [];219 const accounts: IKeyringPair[] = [];220 let nonce = await this.helper.chain.getNonce(donor.address);221 const tokenNominal = this.helper.balance.getOneTokenNominal();222 for (let i = 0; i < accountsToCreate; i++) {223 if (i === 500) { // if there are too many accounts to create224 await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled 225 transactions = []; //226 nonce = await this.helper.chain.getNonce(donor.address); // update nonce 227 }228 const recepient = this.helper.util.fromSeed(mnemonicGenerate());229 accounts.push(recepient);230 if (withBalance !== 0n) {231 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);232 transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));233 nonce++;234 }235 }236 237 const fullfilledAccounts = [];238 await Promise.allSettled(transactions);239 for (const account of accounts) {240 const accountBalance = await this.helper.balance.getSubstrate(account.address);241 if (accountBalance === withBalance * tokenNominal) {242 fullfilledAccounts.push(account);243 }244 }245 return fullfilledAccounts;246 };247248 249 const crowd: IKeyringPair[] = [];250 // do up to 5 retries251 for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {252 const asManyAsCan = await createAsManyAsCan();253 crowd.push(...asManyAsCan);254 accountsToCreate -= asManyAsCan.length;255 }256257 if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);258259 return crowd;260 };261262 isDevNode = async () => {263 let blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();264 if (blockNumber == 0) {265 await this.helper.wait.newBlocks(1); 266 blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();267 }268 const block2 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber])]);269 const block1 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber - 1])]);270 const findCreationDate = (block: any) => {271 const humanBlock = block.toHuman();272 let date;273 humanBlock.block.extrinsics.forEach((ext: any) => {274 if(ext.method.section === 'timestamp') {275 date = Number(ext.method.args.now.replaceAll(',', ''));276 }277 });278 return date;279 };280 const block1date = await findCreationDate(block1);281 const block2date = await findCreationDate(block2);282 if(block2date! - block1date! < 9000) return true;283 };284 285 async calculcateFee(payer: ICrossAccountId, promise: () => Promise<any>): Promise<bigint> {286 const address = payer.Substrate ? payer.Substrate : await this.helper.address.ethToSubstrate(payer.Ethereum!);287 let balance = await this.helper.balance.getSubstrate(address); 288 289 await promise();290 291 balance -= await this.helper.balance.getSubstrate(address);292 293 return balance;294 }295296 calculatePalletAddress(palletId: any) {297 const address = stringToU8a(('modl' + palletId).padEnd(32, '\0'));298 return encodeAddress(address);299 }300}301302class MoonbeamAccountGroup {303 helper: MoonbeamHelper;304305 keyring: Keyring;306 _alithAccount: IKeyringPair;307 _baltatharAccount: IKeyringPair;308 _dorothyAccount: IKeyringPair;309310 constructor(helper: MoonbeamHelper) {311 this.helper = helper;312313 this.keyring = new Keyring({type: 'ethereum'});314 const alithPrivateKey = '0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133';315 const baltatharPrivateKey = '0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b';316 const dorothyPrivateKey = '0x39539ab1876910bbf3a223d84a29e28f1cb4e2e456503e7e91ed39b2e7223d68';317318 this._alithAccount = this.keyring.addFromUri(alithPrivateKey, undefined, 'ethereum');319 this._baltatharAccount = this.keyring.addFromUri(baltatharPrivateKey, undefined, 'ethereum');320 this._dorothyAccount = this.keyring.addFromUri(dorothyPrivateKey, undefined, 'ethereum');321 }322323 alithAccount() {324 return this._alithAccount;325 }326327 baltatharAccount() {328 return this._baltatharAccount;329 }330331 dorothyAccount() {332 return this._dorothyAccount;333 }334335 create() {336 return this.keyring.addFromUri(mnemonicGenerate());337 }338}339340class WaitGroup {341 helper: ChainHelperBase;342343 constructor(helper: ChainHelperBase) {344 this.helper = helper;345 }346347 /**348 * Wait for specified number of blocks349 * @param blocksCount number of blocks to wait350 * @returns 351 */352 newBlocks(blocksCount = 1): Promise<void> {353 // eslint-disable-next-line no-async-promise-executor354 const promise = new Promise<void>(async (resolve) => {355 const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(() => {356 if (blocksCount > 0) {357 blocksCount--;358 } else {359 unsubscribe();360 resolve();361 }362 });363 });364 return promise;365 }366367 forParachainBlockNumber(blockNumber: bigint) {368 // eslint-disable-next-line no-async-promise-executor369 return new Promise<void>(async (resolve) => {370 const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads((data: any) => {371 if (data.number.toNumber() >= blockNumber) {372 unsubscribe();373 resolve();374 }375 });376 });377 }378 379 forRelayBlockNumber(blockNumber: bigint) {380 // eslint-disable-next-line no-async-promise-executor381 return new Promise<void>(async (resolve) => {382 const unsubscribe = await this.helper.getApi().query.parachainSystem.validationData((data: any) => {383 if (data.value.relayParentNumber.toNumber() >= blockNumber) {384 // @ts-ignore385 unsubscribe();386 resolve();387 }388 });389 });390 }391392 event(maxBlocksToWait: number, eventSection: string, eventMethod: string) {393 // eslint-disable-next-line no-async-promise-executor394 const promise = new Promise<EventRecord | null>(async (resolve) => {395 const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(async header => {396 const blockNumber = header.number.toHuman();397 const blockHash = header.hash;398 const eventIdStr = `${eventSection}.${eventMethod}`;399 const waitLimitStr = `wait blocks remaining: ${maxBlocksToWait}`;400 401 this.helper.logger.log(`[Block #${blockNumber}] Waiting for event \`${eventIdStr}\` (${waitLimitStr})`);402 403 const apiAt = await this.helper.getApi().at(blockHash);404 const eventRecords = (await apiAt.query.system.events()) as any;405 406 const neededEvent = eventRecords.toArray().find((r: FrameSystemEventRecord) => {407 return r.event.section == eventSection && r.event.method == eventMethod;408 });409 410 if (neededEvent) {411 unsubscribe();412 resolve(neededEvent);413 } else if (maxBlocksToWait > 0) {414 maxBlocksToWait--;415 } else {416 this.helper.logger.log(`Event \`${eventIdStr}\` is NOT found`);417 418 unsubscribe();419 resolve(null);420 }421 });422 });423 return promise;424 }425}426427class AdminGroup {428 helper: UniqueHelper;429430 constructor(helper: UniqueHelper) {431 this.helper = helper;432 }433434 async payoutStakers(signer: IKeyringPair, stakersToPayout: number) {435 const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);436 return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {437 return {438 staker: e.event.data[0].toString(),439 stake: e.event.data[1].toBigInt(),440 payout: e.event.data[2].toBigInt(),441 };442 });443 }444}