difftreelog
test changed the privateKeyWrapper parameter from optional to mandatory
in: master
63 files changed
tests/src/addCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -27,8 +27,8 @@
it('Add collection admin.', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.equal(alice.address);
@@ -44,9 +44,9 @@
it('Add admin using added collection admin.', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//CHARLIE');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//CHARLIE');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.equal(alice.address);
@@ -70,8 +70,8 @@
it("Not owner can't add collection admin.", async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const nonOwner = privateKeyWrapper!('//Bob_stash');
+ const alice = privateKeyWrapper('//Alice');
+ const nonOwner = privateKeyWrapper('//Bob_stash');
const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(alice.address));
await expect(submitTransactionExpectFailAsync(nonOwner, changeAdminTx)).to.be.rejected;
@@ -87,8 +87,8 @@
await usingApi(async (api, privateKeyWrapper) => {
// tslint:disable-next-line: no-bitwise
const collectionId = (1 << 32) - 1;
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const changeOwnerTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -101,8 +101,8 @@
it("Can't add an admin to a destroyed collection.", async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
await destroyCollectionExpectSuccess(collectionId);
const changeOwnerTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -114,15 +114,15 @@
it('Add an admin to a collection that has reached the maximum number of admins limit', async () => {
await usingApi(async (api: ApiPromise, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const accounts = [
- privateKeyWrapper!('//AdminTest/1').address,
- privateKeyWrapper!('//AdminTest/2').address,
- privateKeyWrapper!('//AdminTest/3').address,
- privateKeyWrapper!('//AdminTest/4').address,
- privateKeyWrapper!('//AdminTest/5').address,
- privateKeyWrapper!('//AdminTest/6').address,
- privateKeyWrapper!('//AdminTest/7').address,
+ privateKeyWrapper('//AdminTest/1').address,
+ privateKeyWrapper('//AdminTest/2').address,
+ privateKeyWrapper('//AdminTest/3').address,
+ privateKeyWrapper('//AdminTest/4').address,
+ privateKeyWrapper('//AdminTest/5').address,
+ privateKeyWrapper('//AdminTest/6').address,
+ privateKeyWrapper('//AdminTest/7').address,
];
const collectionId = await createCollectionExpectSuccess();
tests/src/addToAllowList.test.tsdiffbeforeafterboth--- a/tests/src/addToAllowList.test.ts
+++ b/tests/src/addToAllowList.test.ts
@@ -42,8 +42,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -67,7 +67,7 @@
await usingApi(async (api, privateKeyWrapper) => {
// tslint:disable-next-line: no-bitwise
const collectionId = await getCreatedCollectionCount(api) + 1;
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const tx = api.tx.unique.addToAllowList(collectionId, normalizeAccountId(bob.address));
await expect(submitTransactionExpectFailAsync(alice, tx)).to.be.rejected;
@@ -76,8 +76,8 @@
it('Allow list an address in the collection that was destroyed', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// tslint:disable-next-line: no-bitwise
const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(collectionId);
@@ -88,8 +88,8 @@
it('Allow list an address in the collection that does not have allow list access enabled', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const ferdie = privateKeyWrapper!('//Ferdie');
+ const alice = privateKeyWrapper('//Alice');
+ const ferdie = privateKeyWrapper('//Ferdie');
const collectionId = await createCollectionExpectSuccess();
await enableAllowListExpectSuccess(alice, collectionId);
await enablePublicMintingExpectSuccess(alice, collectionId);
@@ -104,9 +104,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
tests/src/addToContractAllowList.test.tsdiffbeforeafterboth--- a/tests/src/addToContractAllowList.test.ts
+++ b/tests/src/addToContractAllowList.test.ts
@@ -31,7 +31,7 @@
it('Add an address to a contract allow list', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const [contract, deployer] = await deployFlipper(api);
const allowListedBefore = (await api.query.unique.contractAllowList(contract.address, bob.address)).toJSON();
@@ -47,7 +47,7 @@
it('Adding same address to allow list repeatedly should not produce errors', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const [contract, deployer] = await deployFlipper(api);
const allowListedBefore = (await api.query.unique.contractAllowList(contract.address, bob.address)).toJSON();
@@ -70,9 +70,9 @@
it('Add an address to a allow list of a non-contract', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Bob');
- const bob = privateKeyWrapper!('//Bob');
- const charlieGuineaPig = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Bob');
+ const bob = privateKeyWrapper('//Bob');
+ const charlieGuineaPig = privateKeyWrapper('//Charlie');
const allowListedBefore = (await api.query.unique.contractAllowList(charlieGuineaPig.address, bob.address)).toJSON();
const addTx = api.tx.unique.addToContractAllowList(charlieGuineaPig.address, bob.address);
@@ -86,7 +86,7 @@
it('Add to a contract allow list using a non-owner address', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const [contract] = await deployFlipper(api);
const allowListedBefore = (await api.query.unique.contractAllowList(contract.address, bob.address)).toJSON();
tests/src/allowLists.test.tsdiffbeforeafterboth--- a/tests/src/allowLists.test.ts
+++ b/tests/src/allowLists.test.ts
@@ -50,9 +50,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
tests/src/approve.test.tsdiffbeforeafterboth--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -43,9 +43,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -99,9 +99,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -131,9 +131,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -166,9 +166,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -205,10 +205,10 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
- dave = privateKeyWrapper!('//Dave');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
+ dave = privateKeyWrapper('//Dave');
});
});
@@ -228,9 +228,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -267,9 +267,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -300,10 +300,10 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
- dave = privateKeyWrapper!('//Dave');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
+ dave = privateKeyWrapper('//Dave');
});
});
@@ -340,10 +340,10 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
- dave = privateKeyWrapper!('//Dave');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
+ dave = privateKeyWrapper('//Dave');
});
});
@@ -391,9 +391,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -413,9 +413,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
tests/src/change-collection-owner.test.tsdiffbeforeafterboth--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -42,8 +42,8 @@
it('Changing owner changes owner address', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const collection =await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -61,8 +61,8 @@
it('Changing the owner of the collection is not allowed for the former owner', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -81,9 +81,9 @@
it('New collectionOwner has access to sponsorship management operations in the collection', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -125,9 +125,9 @@
it('New collectionOwner has access to changeCollectionOwner', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -152,8 +152,8 @@
it('Not owner can\'t change owner.', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const changeOwnerTx = api.tx.unique.changeCollectionOwner(collectionId, bob.address);
await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;
@@ -169,8 +169,8 @@
it('Collection admin can\'t change owner.', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
@@ -188,8 +188,8 @@
it('Can\'t change owner of a non-existing collection.', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = (1<<32) - 1;
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const changeOwnerTx = api.tx.unique.changeCollectionOwner(collectionId, bob.address);
await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -202,9 +202,9 @@
it('Former collectionOwner not allowed to sponsorship management operations in the collection', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
tests/src/check-event/burnItemEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/burnItemEvent.test.ts
+++ b/tests/src/check-event/burnItemEvent.test.ts
@@ -32,7 +32,7 @@
const checkSystem = 'ExtrinsicSuccess';
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
it('Check event from burnItem(): ', async () => {
tests/src/check-event/createCollectionEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createCollectionEvent.test.ts
+++ b/tests/src/check-event/createCollectionEvent.test.ts
@@ -32,7 +32,7 @@
const checkSystem = 'ExtrinsicSuccess';
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
it('Check event from createCollection(): ', async () => {
tests/src/check-event/createItemEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createItemEvent.test.ts
+++ b/tests/src/check-event/createItemEvent.test.ts
@@ -32,7 +32,7 @@
const checkSystem = 'ExtrinsicSuccess';
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
it('Check event from createItem(): ', async () => {
tests/src/check-event/createMultipleItemsEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createMultipleItemsEvent.test.ts
+++ b/tests/src/check-event/createMultipleItemsEvent.test.ts
@@ -32,7 +32,7 @@
const checkSystem = 'ExtrinsicSuccess';
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
it('Check event from createMultipleItems(): ', async () => {
tests/src/check-event/destroyCollectionEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/destroyCollectionEvent.test.ts
+++ b/tests/src/check-event/destroyCollectionEvent.test.ts
@@ -31,7 +31,7 @@
const checkSystem = 'ExtrinsicSuccess';
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
it('Check event from destroyCollection(): ', async () => {
tests/src/check-event/transferEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/transferEvent.test.ts
+++ b/tests/src/check-event/transferEvent.test.ts
@@ -33,8 +33,8 @@
const checkSystem = 'ExtrinsicSuccess';
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
it('Check event from transfer(): ', async () => {
tests/src/check-event/transferFromEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/transferFromEvent.test.ts
+++ b/tests/src/check-event/transferFromEvent.test.ts
@@ -33,8 +33,8 @@
const checkSystem = 'ExtrinsicSuccess';
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
it('Check event from transferFrom(): ', async () => {
tests/src/contracts.test.tsdiffbeforeafterboth--- a/tests/src/contracts.test.ts
+++ b/tests/src/contracts.test.ts
@@ -19,7 +19,6 @@
import usingApi, {submitTransactionAsync} from './substrate/substrate-api';
import fs from 'fs';
import {Abi, ContractPromise as Contract} from '@polkadot/api-contract';
-import privateKey from './substrate/privateKey';
import {
deployFlipper,
getFlipValue,
@@ -54,7 +53,7 @@
const [contract, deployer] = await deployFlipper(api);
const initialGetResponse = await getFlipValue(contract, deployer);
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const flip = contract.tx.flip(value, gasLimit);
await submitTransactionAsync(bob, flip);
@@ -77,8 +76,8 @@
describe.skip('Chain extensions', () => {
it('Transfer CE', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// Prep work
const collectionId = await createCollectionExpectSuccess();
@@ -101,8 +100,8 @@
it('Mint CE', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const collectionId = await createCollectionExpectSuccess();
const [contract] = await deployTransferContract(api);
@@ -128,8 +127,8 @@
it('Bulk mint CE', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const collectionId = await createCollectionExpectSuccess();
const [contract] = await deployTransferContract(api);
@@ -169,9 +168,9 @@
it('Approve CE', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const collectionId = await createCollectionExpectSuccess();
const [contract] = await deployTransferContract(api);
@@ -188,9 +187,9 @@
it('TransferFrom CE', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const collectionId = await createCollectionExpectSuccess();
const [contract] = await deployTransferContract(api);
@@ -209,8 +208,8 @@
it('ToggleAllowList CE', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const collectionId = await createCollectionExpectSuccess();
const [contract] = await deployTransferContract(api);
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -58,8 +58,8 @@
it('Create new collection with extra fields', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const tx = api.tx.unique.createCollectionEx({
mode: {Fungible: 8},
permissions: {
@@ -101,7 +101,7 @@
});
it('fails when bad limits are set', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const tx = api.tx.unique.createCollectionEx({mode: 'NFT', limits: {tokenLimit: 0}});
await expect(executeTransaction(api, alice, tx)).to.be.rejectedWith(/^common.CollectionTokenLimitExceeded$/);
});
tests/src/createMultipleItems.test.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {ApiPromise} from '@polkadot/api';18import {IKeyringPair} from '@polkadot/types/types';19import chai from 'chai';20import chaiAsPromised from 'chai-as-promised';21import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync, executeTransaction} from './substrate/substrate-api';22import {23 createCollectionExpectSuccess,24 destroyCollectionExpectSuccess,25 getGenericResult,26 normalizeAccountId,27 setCollectionLimitsExpectSuccess,28 addCollectionAdminExpectSuccess,29 getBalance,30 getTokenOwner,31 getLastTokenId,32 getCreatedCollectionCount,33 createCollectionWithPropsExpectSuccess,34 createMultipleItemsWithPropsExpectSuccess,35 getTokenProperties,36} from './util/helpers';3738chai.use(chaiAsPromised);39const expect = chai.expect;4041describe('Integration Test createMultipleItems(collection_id, owner, items_data):', () => {42 it('Create 0x31, 0x32, 0x33 items in active NFT collection and verify tokens data in chain', async () => {43 await usingApi(async (api, privateKeyWrapper) => {44 const collectionId = await createCollectionExpectSuccess();45 const itemsListIndexBefore = await getLastTokenId(api, collectionId);46 expect(itemsListIndexBefore).to.be.equal(0);4748 const alice = privateKeyWrapper!('//Alice');49 await submitTransactionAsync(50 alice, 51 api.tx.unique.setPropertyPermissions(collectionId, [{key: 'data', permission: {tokenOwner: true}}]),52 );53 54 const args = [55 {NFT: {properties: [{key: 'data', value: '1'}]}},56 {NFT: {properties: [{key: 'data', value: '2'}]}},57 {NFT: {properties: [{key: 'data', value: '3'}]}},58 ];59 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);60 await submitTransactionAsync(alice, createMultipleItemsTx);61 const itemsListIndexAfter = await getLastTokenId(api, collectionId);62 expect(itemsListIndexAfter).to.be.equal(3);6364 expect(await getTokenOwner(api, collectionId, 1)).to.be.deep.equal(normalizeAccountId(alice.address));65 expect(await getTokenOwner(api, collectionId, 2)).to.be.deep.equal(normalizeAccountId(alice.address));66 expect(await getTokenOwner(api, collectionId, 3)).to.be.deep.equal(normalizeAccountId(alice.address));6768 expect((await getTokenProperties(api, collectionId, 1, ['data']))[0].value).to.be.equal('1');69 expect((await getTokenProperties(api, collectionId, 2, ['data']))[0].value).to.be.equal('2');70 expect((await getTokenProperties(api, collectionId, 3, ['data']))[0].value).to.be.equal('3');71 });72 });7374 it('Create 0x01, 0x02, 0x03 items in active Fungible collection and verify tokens data in chain', async () => {75 await usingApi(async (api, privateKeyWrapper) => {76 const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});77 const itemsListIndexBefore = await getLastTokenId(api, collectionId);78 expect(itemsListIndexBefore).to.be.equal(0);79 const alice = privateKeyWrapper!('//Alice');80 const args = [81 {Fungible: {value: 1}},82 {Fungible: {value: 2}},83 {Fungible: {value: 3}},84 ];85 const createMultipleItemsTx = api.tx.unique86 .createMultipleItems(collectionId, normalizeAccountId(alice.address), args);87 await submitTransactionAsync(alice, createMultipleItemsTx);88 const token1Data = await getBalance(api, collectionId, alice.address, 0);8990 expect(token1Data).to.be.equal(6n); // 1 + 2 + 391 });92 });9394 it('Create 0x31, 0x32, 0x33 items in active ReFungible collection and verify tokens data in chain', async () => {95 await usingApi(async (api, privateKeyWrapper) => {96 const collectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});97 const itemsListIndexBefore = await getLastTokenId(api, collectionId);98 expect(itemsListIndexBefore).to.be.equal(0);99 const alice = privateKeyWrapper!('//Alice');100 const args = [101 {ReFungible: {pieces: 1}},102 {ReFungible: {pieces: 2}},103 {ReFungible: {pieces: 3}},104 ];105 const createMultipleItemsTx = api.tx.unique106 .createMultipleItems(collectionId, normalizeAccountId(alice.address), args);107 await submitTransactionAsync(alice, createMultipleItemsTx);108 const itemsListIndexAfter = await getLastTokenId(api, collectionId);109 expect(itemsListIndexAfter).to.be.equal(3);110111 expect(await getBalance(api, collectionId, alice.address, 1)).to.be.equal(1n);112 expect(await getBalance(api, collectionId, alice.address, 2)).to.be.equal(2n);113 expect(await getBalance(api, collectionId, alice.address, 3)).to.be.equal(3n);114 });115 });116117 it('Can mint amount of items equals to collection limits', async () => {118 await usingApi(async (api, privateKeyWrapper) => {119 const alice = privateKeyWrapper!('//Alice');120121 const collectionId = await createCollectionExpectSuccess();122 await setCollectionLimitsExpectSuccess(alice, collectionId, {123 tokenLimit: 2,124 });125 const args = [126 {NFT: {}},127 {NFT: {}},128 ];129 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);130 const events = await submitTransactionAsync(alice, createMultipleItemsTx);131 const result = getGenericResult(events);132 expect(result.success).to.be.true;133 });134 });135136 it('Create 0x31, 0x32, 0x33 items in active NFT with property Admin', async () => {137 await usingApi(async (api, privateKeyWrapper) => {138 const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: false}}]});139 const itemsListIndexBefore = await getLastTokenId(api, collectionId);140 expect(itemsListIndexBefore).to.be.equal(0);141 const alice = privateKeyWrapper!('//Alice');142 const args = [143 {NFT: {properties: [{key: 'k', value: 'v1'}]}},144 {NFT: {properties: [{key: 'k', value: 'v2'}]}},145 {NFT: {properties: [{key: 'k', value: 'v3'}]}},146 ];147148 await createMultipleItemsWithPropsExpectSuccess(alice, collectionId, args);149 const itemsListIndexAfter = await getLastTokenId(api, collectionId);150 expect(itemsListIndexAfter).to.be.equal(3);151152 expect(await getTokenOwner(api, collectionId, 1)).to.be.deep.equal(normalizeAccountId(alice.address));153 expect(await getTokenOwner(api, collectionId, 2)).to.be.deep.equal(normalizeAccountId(alice.address));154 expect(await getTokenOwner(api, collectionId, 3)).to.be.deep.equal(normalizeAccountId(alice.address));155156 expect((await getTokenProperties(api, collectionId, 1, ['k']))[0].value).to.be.equal('v1');157 expect((await getTokenProperties(api, collectionId, 2, ['k']))[0].value).to.be.equal('v2');158 expect((await getTokenProperties(api, collectionId, 3, ['k']))[0].value).to.be.equal('v3');159 });160 });161162 it('Create 0x31, 0x32, 0x33 items in active NFT with property AdminConst', async () => {163 await usingApi(async (api, privateKeyWrapper) => {164 const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: false, collectionAdmin: true, tokenOwner: false}}]});165 const itemsListIndexBefore = await getLastTokenId(api, collectionId);166 expect(itemsListIndexBefore).to.be.equal(0);167 const alice = privateKeyWrapper!('//Alice');168 const bob = privateKeyWrapper!('//Bob');169 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);170 const args = [171 {NFT: {properties: [{key: 'k', value: 'v1'}]}},172 {NFT: {properties: [{key: 'k', value: 'v2'}]}},173 {NFT: {properties: [{key: 'k', value: 'v3'}]}},174 ];175176 await createMultipleItemsWithPropsExpectSuccess(alice, collectionId, args);177 const itemsListIndexAfter = await getLastTokenId(api, collectionId);178 expect(itemsListIndexAfter).to.be.equal(3);179180 expect(await getTokenOwner(api, collectionId, 1)).to.be.deep.equal(normalizeAccountId(alice.address));181 expect(await getTokenOwner(api, collectionId, 2)).to.be.deep.equal(normalizeAccountId(alice.address));182 expect(await getTokenOwner(api, collectionId, 3)).to.be.deep.equal(normalizeAccountId(alice.address));183184 expect((await getTokenProperties(api, collectionId, 1, ['k']))[0].value).to.be.equal('v1');185 expect((await getTokenProperties(api, collectionId, 2, ['k']))[0].value).to.be.equal('v2');186 expect((await getTokenProperties(api, collectionId, 3, ['k']))[0].value).to.be.equal('v3');187 });188 });189190 it('Create 0x31, 0x32, 0x33 items in active NFT with property itemOwnerOrAdmin', async () => {191 await usingApi(async (api, privateKeyWrapper) => {192 const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});193 const itemsListIndexBefore = await getLastTokenId(api, collectionId);194 expect(itemsListIndexBefore).to.be.equal(0);195 const alice = privateKeyWrapper!('//Alice');196 const args = [197 {NFT: {properties: [{key: 'k', value: 'v1'}]}},198 {NFT: {properties: [{key: 'k', value: 'v2'}]}},199 {NFT: {properties: [{key: 'k', value: 'v3'}]}},200 ];201202 await createMultipleItemsWithPropsExpectSuccess(alice, collectionId, args);203 const itemsListIndexAfter = await getLastTokenId(api, collectionId);204 expect(itemsListIndexAfter).to.be.equal(3);205206 expect(await getTokenOwner(api, collectionId, 1)).to.be.deep.equal(normalizeAccountId(alice.address));207 expect(await getTokenOwner(api, collectionId, 2)).to.be.deep.equal(normalizeAccountId(alice.address));208 expect(await getTokenOwner(api, collectionId, 3)).to.be.deep.equal(normalizeAccountId(alice.address));209210 expect((await getTokenProperties(api, collectionId, 1, ['k']))[0].value).to.be.equal('v1');211 expect((await getTokenProperties(api, collectionId, 2, ['k']))[0].value).to.be.equal('v2');212 expect((await getTokenProperties(api, collectionId, 3, ['k']))[0].value).to.be.equal('v3');213 });214 });215});216217describe('Integration Test createMultipleItems(collection_id, owner, items_data) with collection admin permissions:', () => {218 let alice: IKeyringPair;219 let bob: IKeyringPair;220221 before(async () => {222 await usingApi(async (api, privateKeyWrapper) => {223 alice = privateKeyWrapper!('//Alice');224 bob = privateKeyWrapper!('//Bob');225 });226 });227228 it('Create 0x31, 0x32, 0x33 items in active NFT collection and verify tokens data in chain', async () => {229 await usingApi(async (api: ApiPromise) => {230 const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'data', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});231 const itemsListIndexBefore = await getLastTokenId(api, collectionId);232 expect(itemsListIndexBefore).to.be.equal(0);233 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);234 const args = [235 {NFT: {properties: [{key: 'data', value: 'v1'}]}},236 {NFT: {properties: [{key: 'data', value: 'v2'}]}},237 {NFT: {properties: [{key: 'data', value: 'v3'}]}},238 ];239 const createMultipleItemsTx = api.tx.unique240 .createMultipleItems(collectionId, normalizeAccountId(bob.address), args);241 await submitTransactionAsync(bob, createMultipleItemsTx);242 const itemsListIndexAfter = await getLastTokenId(api, collectionId);243 expect(itemsListIndexAfter).to.be.equal(3);244245 expect(await getTokenOwner(api, collectionId, 1)).to.be.deep.equal(normalizeAccountId(bob.address));246 expect(await getTokenOwner(api, collectionId, 2)).to.be.deep.equal(normalizeAccountId(bob.address));247 expect(await getTokenOwner(api, collectionId, 3)).to.be.deep.equal(normalizeAccountId(bob.address));248249 expect((await getTokenProperties(api, collectionId, 1, ['data']))[0].value).to.be.equal('v1');250 expect((await getTokenProperties(api, collectionId, 2, ['data']))[0].value).to.be.equal('v2');251 expect((await getTokenProperties(api, collectionId, 3, ['data']))[0].value).to.be.equal('v3');252 });253 });254255 it('Create 0x01, 0x02, 0x03 items in active Fungible collection and verify tokens data in chain', async () => {256 await usingApi(async (api: ApiPromise) => {257 const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});258 const itemsListIndexBefore = await getLastTokenId(api, collectionId);259 expect(itemsListIndexBefore).to.be.equal(0);260 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);261 const args = [262 {Fungible: {value: 1}},263 {Fungible: {value: 2}},264 {Fungible: {value: 3}},265 ];266 const createMultipleItemsTx = api.tx.unique267 .createMultipleItems(collectionId, normalizeAccountId(bob.address), args);268 await submitTransactionAsync(bob, createMultipleItemsTx);269 const token1Data = await getBalance(api, collectionId, bob.address, 0);270271 expect(token1Data).to.be.equal(6n); // 1 + 2 + 3272 });273 });274275 it('Create 0x31, 0x32, 0x33 items in active ReFungible collection and verify tokens data in chain', async () => {276 await usingApi(async (api: ApiPromise) => {277 const collectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});278 const itemsListIndexBefore = await getLastTokenId(api, collectionId);279 expect(itemsListIndexBefore).to.be.equal(0);280 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);281 const args = [282 {ReFungible: {pieces: 1}},283 {ReFungible: {pieces: 2}},284 {ReFungible: {pieces: 3}},285 ];286 const createMultipleItemsTx = api.tx.unique287 .createMultipleItems(collectionId, normalizeAccountId(bob.address), args);288 await submitTransactionAsync(bob, createMultipleItemsTx);289 const itemsListIndexAfter = await getLastTokenId(api, collectionId);290 expect(itemsListIndexAfter).to.be.equal(3);291292 expect(await getBalance(api, collectionId, bob.address, 1)).to.be.equal(1n);293 expect(await getBalance(api, collectionId, bob.address, 2)).to.be.equal(2n);294 expect(await getBalance(api, collectionId, bob.address, 3)).to.be.equal(3n);295 });296 });297});298299describe('Negative Integration Test createMultipleItems(collection_id, owner, items_data):', () => {300 let alice: IKeyringPair;301 let bob: IKeyringPair;302303 before(async () => {304 await usingApi(async (api, privateKeyWrapper) => {305 alice = privateKeyWrapper!('//Alice');306 bob = privateKeyWrapper!('//Bob');307 });308 });309310 it('Regular user cannot create items in active NFT collection', async () => {311 await usingApi(async (api: ApiPromise) => {312 const collectionId = await createCollectionExpectSuccess();313 const itemsListIndexBefore = await getLastTokenId(api, collectionId);314 expect(itemsListIndexBefore).to.be.equal(0);315 const args = [{NFT: {}},316 {NFT: {}},317 {NFT: {}}];318 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);319 await expect(executeTransaction(api, bob, createMultipleItemsTx)).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);320 });321 });322323 it('Regular user cannot create items in active Fungible collection', async () => {324 await usingApi(async (api: ApiPromise) => {325 const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});326 const itemsListIndexBefore = await getLastTokenId(api, collectionId);327 expect(itemsListIndexBefore).to.be.equal(0);328 const args = [329 {Fungible: {value: 1}},330 {Fungible: {value: 2}},331 {Fungible: {value: 3}},332 ];333 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);334 await expect(executeTransaction(api, bob, createMultipleItemsTx)).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);335 });336 });337338 it('Regular user cannot create items in active ReFungible collection', async () => {339 await usingApi(async (api: ApiPromise) => {340 const collectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});341 const itemsListIndexBefore = await getLastTokenId(api, collectionId);342 expect(itemsListIndexBefore).to.be.equal(0);343 const args = [344 {ReFungible: {pieces: 1}},345 {ReFungible: {pieces: 1}},346 {ReFungible: {pieces: 1}},347 ];348 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);349 await expect(executeTransaction(api, bob, createMultipleItemsTx)).to.be.rejectedWith(/common\.PublicMintingNotAllowed/);350 });351 });352353 it('Create token in not existing collection', async () => {354 await usingApi(async (api: ApiPromise) => {355 const collectionId = await getCreatedCollectionCount(api) + 1;356 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), ['NFT', 'NFT', 'NFT']);357 await expect(executeTransaction(api, alice, createMultipleItemsTx)).to.be.rejectedWith(/common\.CollectionNotFound/);358 });359 });360361 it('Create NFT and Re-fungible tokens that has reached the maximum data limit', async () => {362 await usingApi(async (api, privateKeyWrapper) => {363 // NFT364 const collectionId = await createCollectionWithPropsExpectSuccess({365 propPerm: [{key: 'key', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}],366 });367 const alice = privateKeyWrapper!('//Alice');368 const args = [369 {NFT: {properties: [{key: 'key', value: 'A'.repeat(32769)}]}},370 {NFT: {properties: [{key: 'key', value: 'B'.repeat(32769)}]}},371 {NFT: {properties: [{key: 'key', value: 'C'.repeat(32769)}]}},372 ];373 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);374 await expect(submitTransactionExpectFailAsync(alice, createMultipleItemsTx)).to.be.rejected;375376 // ReFungible377 const collectionIdReFungible =378 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});379 const argsReFungible = [380 {ReFungible: ['1'.repeat(2049), 10]},381 {ReFungible: ['2'.repeat(2049), 10]},382 {ReFungible: ['3'.repeat(2049), 10]},383 ];384 const createMultipleItemsTxFungible = api.tx.unique385 .createMultipleItems(collectionIdReFungible, normalizeAccountId(alice.address), argsReFungible);386 await expect(submitTransactionExpectFailAsync(alice, createMultipleItemsTxFungible)).to.be.rejected;387 });388 });389390 it('Create tokens with different types', async () => {391 await usingApi(async (api: ApiPromise) => {392 const collectionId = await createCollectionExpectSuccess();393 const createMultipleItemsTx = api.tx.unique394 .createMultipleItems(collectionId, normalizeAccountId(alice.address), ['NFT', 'Fungible', 'ReFungible']);395 await expect(executeTransaction(api, alice, createMultipleItemsTx)).to.be.rejectedWith(/nonfungible\.NotNonfungibleDataUsedToMintFungibleCollectionToken/);396 // garbage collection :-D // lol397 await destroyCollectionExpectSuccess(collectionId);398 });399 });400401 it('Create tokens with different data limits <> maximum data limit', async () => {402 await usingApi(async (api: ApiPromise) => {403 const collectionId = await createCollectionWithPropsExpectSuccess({404 propPerm: [{key: 'key', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}],405 });406 const args = [407 {NFT: {properties: [{key: 'key', value: 'A'}]}},408 {NFT: {properties: [{key: 'key', value: 'B'.repeat(32769)}]}},409 ];410 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);411 await expect(submitTransactionExpectFailAsync(alice, createMultipleItemsTx)).to.be.rejected;412 });413 });414415 it('Fails when minting tokens exceeds collectionLimits amount', async () => {416 await usingApi(async (api) => {417 const collectionId = await createCollectionExpectSuccess();418 await setCollectionLimitsExpectSuccess(alice, collectionId, {419 tokenLimit: 1,420 });421 const args = [422 {NFT: {}},423 {NFT: {}},424 ];425 const createMultipleItemsTx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);426 await expect(executeTransaction(api, alice, createMultipleItemsTx)).to.be.rejectedWith(/common\.CollectionTokenLimitExceeded/);427 });428 });429430 it('User doesnt have editing rights', async () => {431 await usingApi(async (api: ApiPromise) => {432 const collectionId = await createCollectionWithPropsExpectSuccess({433 propPerm: [{key: 'key1', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}],434 });435 const itemsListIndexBefore = await getLastTokenId(api, collectionId);436 expect(itemsListIndexBefore).to.be.equal(0);437 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);438 const args = [439 {NFT: {properties: [{key: 'key1', value: 'v2'}]}},440 {NFT: {}},441 {NFT: {}},442 ];443444 const tx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(bob.address), args);445 await expect(executeTransaction(api, bob, tx)).to.be.rejectedWith(/common\.NoPermission/);446 });447 });448449 it('Adding property without access rights', async () => {450 await usingApi(async (api: ApiPromise) => {451 const collectionId = await createCollectionWithPropsExpectSuccess({properties: [{key: 'k', value: 'v1'}]});452 const itemsListIndexBefore = await getLastTokenId(api, collectionId);453 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);454 expect(itemsListIndexBefore).to.be.equal(0);455 const args = [{NFT: {properties: [{key: 'k', value: 'v'}]}},456 {NFT: {}},457 {NFT: {}}];458459 const tx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(bob.address), args);460 await expect(executeTransaction(api, bob, tx)).to.be.rejectedWith(/common\.NoPermission/);461 });462 });463464 it('Adding more than 64 prps', async () => {465 await usingApi(async (api: ApiPromise) => {466 const propPerms = [{key: 'key', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}];467 for (let i = 0; i < 65; i++) {468 propPerms.push({key: `key${i}`, permission: {mutable: true, collectionAdmin: true, tokenOwner: true}});469 }470471 const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});472473 const tx1 = api.tx.unique.setPropertyPermissions(collectionId, propPerms);474 await expect(executeTransaction(api, alice, tx1)).to.be.rejectedWith(/common\.PropertyLimitReached/);475476 const itemsListIndexBefore = await getLastTokenId(api, collectionId);477 expect(itemsListIndexBefore).to.be.equal(0);478 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);479480 const prps = [];481482 for (let i = 0; i < 65; i++) {483 prps.push({key: `key${i}`, value: `value${i}`});484 }485486 const args = [487 {NFT: {properties: prps}},488 {NFT: {properties: prps}},489 {NFT: {properties: prps}},490 ];491492 // there are no permissions, but will fail anyway because of too much weight for a block493 const tx2 = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);494 await expect(submitTransactionExpectFailAsync(alice, tx2)).to.be.rejected;495 });496 });497498 it('Trying to add bigger property than allowed', async () => {499 await usingApi(async (api: ApiPromise) => {500 const collectionId = await createCollectionWithPropsExpectSuccess({501 propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}],502 });503 const itemsListIndexBefore = await getLastTokenId(api, collectionId);504 expect(itemsListIndexBefore).to.be.equal(0);505 const args = [{NFT: {properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]}},506 {NFT: {properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]}},507 {NFT: {properties: [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]}}];508509 const tx = api.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), args);510 await expect(executeTransaction(api, alice, tx)).to.be.rejectedWith(/common\.NoPermission/);511 });512 });513});tests/src/createMultipleItemsEx.test.tsdiffbeforeafterboth--- a/tests/src/createMultipleItemsEx.test.ts
+++ b/tests/src/createMultipleItemsEx.test.ts
@@ -22,9 +22,9 @@
it('can initialize multiple NFT with different owners', async () => {
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const data = [
{
owner: {substrate: alice.address},
@@ -47,9 +47,9 @@
it('createMultipleItemsEx with property Admin', async () => {
const collection = await createCollectionWithPropsExpectSuccess({mode: {type: 'NFT'}, propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: false}}]});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const data = [
{
owner: {substrate: alice.address},
@@ -75,9 +75,9 @@
it('createMultipleItemsEx with property AdminConst', async () => {
const collection = await createCollectionWithPropsExpectSuccess({mode: {type: 'NFT'}, propPerm: [{key: 'k', permission: {mutable: false, collectionAdmin: true, tokenOwner: false}}]});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const data = [
{
owner: {substrate: alice.address},
@@ -103,9 +103,9 @@
it('createMultipleItemsEx with property itemOwnerOrAdmin', async () => {
const collection = await createCollectionWithPropsExpectSuccess({mode: {type: 'NFT'}, propPerm: [{key: 'k', permission: {mutable: false, collectionAdmin: true, tokenOwner: true}}]});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const data = [
{
owner: {substrate: alice.address},
@@ -132,9 +132,9 @@
const collection = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}],
propPerm: [{key: 'key1', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}]});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
await addCollectionAdminExpectSuccess(alice, collection, bob.address);
const data = [
{
@@ -161,8 +161,8 @@
const collection = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}],
propPerm: [{key: 'key1', permission: {mutable: false, collectionAdmin: false, tokenOwner: false}}]});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
await addCollectionAdminExpectSuccess(alice, collection, bob.address);
const data = [
{
@@ -188,9 +188,9 @@
it('Adding property without access rights', async () => {
const collection = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}]});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
await addCollectionAdminExpectSuccess(alice, collection, bob.address);
const data = [
{
@@ -221,7 +221,7 @@
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
await expect(executeTransaction(api, alice, api.tx.unique.setPropertyPermissions(collection, propPerms))).to.be.rejectedWith(/common\.PropertyLimitReached/);
});
});
@@ -229,9 +229,9 @@
it('Trying to add bigger property than allowed', async () => {
const collection = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
await addCollectionAdminExpectSuccess(alice, collection, bob.address);
const data = [
{
@@ -253,9 +253,9 @@
it('can initialize multiple NFT with different owners', async () => {
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const data = [
{
owner: {substrate: alice.address},
@@ -278,9 +278,9 @@
it('can initialize multiple NFT with different owners', async () => {
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const data = [
{
owner: {substrate: alice.address},
@@ -304,8 +304,8 @@
const collection = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// Polkadot requires map, and yet requires keys to be JSON encoded
const users = new Map();
users.set(JSON.stringify({substrate: alice.address}), 1);
tests/src/creditFeesToTreasury.test.tsdiffbeforeafterboth--- a/tests/src/creditFeesToTreasury.test.ts
+++ b/tests/src/creditFeesToTreasury.test.ts
@@ -65,8 +65,8 @@
describe('integration test: Fees must be credited to Treasury:', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -77,7 +77,7 @@
const totalBefore = (await api.query.balances.totalIssuance()).toBigInt();
- const alicePrivateKey = privateKeyWrapper!('//Alice');
+ const alicePrivateKey = privateKeyWrapper('//Alice');
const amount = 1n;
const transfer = api.tx.balances.transfer(bobsPublicKey, amount);
@@ -95,7 +95,7 @@
await skipInflationBlock(api);
await waitNewBlocks(api, 1);
- const alicePrivateKey = privateKeyWrapper!('//Alice');
+ const alicePrivateKey = privateKeyWrapper('//Alice');
const treasuryBalanceBefore: bigint = (await api.query.system.account(TREASURY)).data.free.toBigInt();
const aliceBalanceBefore: bigint = (await api.query.system.account(alicesPublicKey)).data.free.toBigInt();
@@ -118,7 +118,7 @@
//await skipInflationBlock(api);
await waitNewBlocks(api, 1);
- const bobPrivateKey = privateKeyWrapper!('//Bob');
+ const bobPrivateKey = privateKeyWrapper('//Bob');
const treasuryBalanceBefore = (await api.query.system.account(TREASURY)).data.free.toBigInt();
const bobBalanceBefore = (await api.query.system.account(bobsPublicKey)).data.free.toBigInt();
tests/src/destroyCollection.test.tsdiffbeforeafterboth--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -50,8 +50,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
tests/src/enableContractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/enableContractSponsoring.test.ts
+++ b/tests/src/enableContractSponsoring.test.ts
@@ -79,7 +79,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
tests/src/enableDisableTransfer.test.tsdiffbeforeafterboth--- a/tests/src/enableDisableTransfer.test.ts
+++ b/tests/src/enableDisableTransfer.test.ts
@@ -31,8 +31,8 @@
describe('Enable/Disable Transfers', () => {
it('User can transfer token with enabled transfer flag', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
@@ -46,8 +46,8 @@
it('User can\'n transfer token with disabled transfer flag', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
@@ -63,7 +63,7 @@
describe('Negative Enable/Disable Transfers', () => {
it('Non-owner cannot change transfer flag', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -53,7 +53,7 @@
const caller = await createEthAccountWithBalance(api, web3);
const receiver = createEthAccount(web3);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -6,7 +6,7 @@
describe('EVM collection properties', () => {
itWeb3('Can be set', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
@@ -21,7 +21,7 @@
expect(value).to.equal('testValue');
});
itWeb3('Can be deleted', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
@@ -38,7 +38,7 @@
expect(result.length).to.equal(0);
});
itWeb3('Can be read', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = createEthAccount(web3);
const collection = await createCollectionExpectSuccess({mode: {type:'NFT'}});
tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -5,7 +5,7 @@
describe('evm collection sponsoring', () => {
itWeb3('sponsors mint transactions', async ({web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const collection = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collection, alice.address);
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -63,7 +63,7 @@
});
itWeb3('In generous mode, non-allowlisted user transaction will be sponsored', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const caller = await createEthAccountWithBalance(api, web3);
@@ -91,7 +91,7 @@
});
itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should decrease (allowlisted)', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const caller = createEthAccount(web3);
@@ -121,7 +121,7 @@
});
itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should not decrease (non-allowlisted)', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const caller = createEthAccount(web3);
@@ -149,7 +149,7 @@
});
itWeb3('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const caller = await createEthAccountWithBalance(api, web3);
@@ -178,7 +178,7 @@
});
itWeb3('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const caller = await createEthAccountWithBalance(api, web3);
@@ -301,8 +301,8 @@
//TODO: CORE-302 add eth methods
itWeb3.skip('Check that transaction via EVM spend money from substrate address', async ({api, web3, privateKeyWrapper}) => {
- const owner = privateKeyWrapper!('//Alice');
- const user = privateKeyWrapper!(`//User/${Date.now()}`);
+ const owner = privateKeyWrapper('//Alice');
+ const user = privateKeyWrapper(`//User/${Date.now()}`);
const userEth = subToEth(user.address);
const collectionId = await createCollectionExpectSuccess();
await addCollectionAdminExpectSuccess(owner, collectionId, {Ethereum: userEth});
tests/src/eth/crossTransfer.test.tsdiffbeforeafterboth--- a/tests/src/eth/crossTransfer.test.ts
+++ b/tests/src/eth/crossTransfer.test.ts
@@ -32,9 +32,9 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
await createFungibleItemExpectSuccess(alice, collection, {Value: 200n}, {Substrate: alice.address});
await transferExpectSuccess(collection, 0, alice, {Ethereum: subToEth(charlie.address)} , 200, 'Fungible');
await transferFromExpectSuccess(collection, 0, alice, {Ethereum: subToEth(charlie.address)}, charlie, 50, 'Fungible');
@@ -46,8 +46,8 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const bobProxy = await createEthAccountWithBalance(api, web3);
const aliceProxy = await createEthAccountWithBalance(api, web3);
@@ -68,9 +68,9 @@
name: 'token name',
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
await transferExpectSuccess(collection, tokenId, alice, {Ethereum: subToEth(charlie.address)}, 1, 'NFT');
await transferFromExpectSuccess(collection, tokenId, alice, {Ethereum: subToEth(charlie.address)}, charlie, 1, 'NFT');
@@ -82,9 +82,9 @@
name: 'token name',
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const bobProxy = await createEthAccountWithBalance(api, web3);
const aliceProxy = await createEthAccountWithBalance(api, web3);
const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -25,7 +25,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
@@ -43,7 +43,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
@@ -63,7 +63,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
@@ -102,7 +102,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = createEthAccount(web3);
await transferBalanceToEth(api, alice, owner);
@@ -160,7 +160,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = createEthAccount(web3);
await transferBalanceToEth(api, alice, owner);
@@ -206,7 +206,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const spender = createEthAccount(web3);
@@ -224,7 +224,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const spender = await createEthAccountWithBalance(api, web3);
@@ -244,7 +244,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const receiver = createEthAccount(web3);
@@ -264,7 +264,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const receiver = createEthAccount(web3);
@@ -294,8 +294,8 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const receiver = createEthAccount(web3);
@@ -335,7 +335,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const receiver = createEthAccount(web3);
tests/src/eth/marketplace/marketplace.test.tsdiffbeforeafterboth--- a/tests/src/eth/marketplace/marketplace.test.ts
+++ b/tests/src/eth/marketplace/marketplace.test.ts
@@ -38,7 +38,7 @@
describe('Matcher contract usage', () => {
itWeb3('With UNQ', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const matcherOwner = await createEthAccountWithBalance(api, web3);
const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
from: matcherOwner,
@@ -60,7 +60,7 @@
await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});
await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));
- const seller = privateKeyWrapper!(`//Seller/${Date.now()}`);
+ const seller = privateKeyWrapper(`//Seller/${Date.now()}`);
await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
@@ -99,7 +99,7 @@
itWeb3('With escrow', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const matcherOwner = await createEthAccountWithBalance(api, web3);
const escrow = await createEthAccountWithBalance(api, web3);
const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
@@ -123,7 +123,7 @@
await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});
await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));
- const seller = privateKeyWrapper!(`//Seller/${Date.now()}`);
+ const seller = privateKeyWrapper(`//Seller/${Date.now()}`);
await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
@@ -170,7 +170,7 @@
itWeb3('Sell tokens from substrate user via EVM contract', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const matcherOwner = await createEthAccountWithBalance(api, web3);
const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
from: matcherOwner,
@@ -183,7 +183,7 @@
await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});
const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), {from: matcherOwner});
- const seller = privateKeyWrapper!(`//Seller/${Date.now()}`);
+ const seller = privateKeyWrapper(`//Seller/${Date.now()}`);
await transferBalanceTo(api, alice, seller.address);
const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
tests/src/eth/migration.test.tsdiffbeforeafterboth--- a/tests/src/eth/migration.test.ts
+++ b/tests/src/eth/migration.test.ts
@@ -53,7 +53,7 @@
['0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643', '0x0000000000000000000000000000000000000000000000000000000000000004'],
];
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
await submitTransactionAsync(alice, api.tx.sudo.sudo(api.tx.evmMigration.begin(ADDRESS) as any));
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -25,7 +25,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
@@ -41,7 +41,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum:caller});
@@ -59,7 +59,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});
@@ -117,7 +117,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const changeAdminTx = api.tx.unique.addCollectionAdmin(collection, {Ethereum: caller});
@@ -180,7 +180,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
@@ -211,7 +211,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = createEthAccount(web3);
await transferBalanceToEth(api, alice, owner);
@@ -245,7 +245,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = createEthAccount(web3);
await transferBalanceToEth(api, alice, owner);
@@ -293,7 +293,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = createEthAccount(web3);
await transferBalanceToEth(api, alice, owner);
@@ -339,7 +339,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const spender = createEthAccount(web3);
@@ -357,7 +357,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const spender = await createEthAccountWithBalance(api, web3);
@@ -377,7 +377,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const receiver = createEthAccount(web3);
@@ -397,7 +397,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const address = collectionIdToAddress(collection);
const contract = new web3.eth.Contract(nonFungibleAbi as any, address);
@@ -424,7 +424,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const address = collectionIdToAddress(collection);
const contract = new web3.eth.Contract(nonFungibleAbi as any, address);
@@ -451,7 +451,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const receiver = createEthAccount(web3);
@@ -481,8 +481,8 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const receiver = createEthAccount(web3);
@@ -513,7 +513,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const receiver = createEthAccount(web3);
tests/src/eth/payable.test.tsdiffbeforeafterboth--- a/tests/src/eth/payable.test.ts
+++ b/tests/src/eth/payable.test.ts
@@ -34,7 +34,7 @@
itWeb3('Evm contract can receive wei from substrate account', async ({api, web3, privateKeyWrapper}) => {
const deployer = await createEthAccountWithBalance(api, web3);
const contract = await deployCollector(web3, deployer);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
// Transaction fee/value will be payed from subToEth(sender) evm balance,
// which is backed by evmToAddress(subToEth(sender)) substrate balance
@@ -64,7 +64,7 @@
itWeb3('Wei sent directly to backing storage of evm contract balance is unaccounted', async({api, web3, privateKeyWrapper}) => {
const deployer = await createEthAccountWithBalance(api, web3);
const contract = await deployCollector(web3, deployer);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
await transferBalanceExpectSuccess(api, alice, evmToAddress(contract.options.address), '10000');
@@ -77,11 +77,11 @@
const deployer = await createEthAccountWithBalance(api, web3);
const contract = await deployCollector(web3, deployer);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
await web3.eth.sendTransaction({from: deployer, to: contract.options.address, value: CONTRACT_BALANCE.toString(), ...GAS_ARGS});
- const receiver = privateKeyWrapper!(`//Receiver${Date.now()}`);
+ const receiver = privateKeyWrapper(`//Receiver${Date.now()}`);
// First receive balance on eth balance of bob
{
tests/src/eth/proxy/fungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/fungibleProxy.test.ts
+++ b/tests/src/eth/proxy/fungibleProxy.test.ts
@@ -39,7 +39,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
await createFungibleItemExpectSuccess(alice, collection, {Value: 200n}, {Substrate: alice.address});
@@ -56,7 +56,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
await createFungibleItemExpectSuccess(alice, collection, {Value: 200n}, {Ethereum: caller});
@@ -75,7 +75,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const spender = createEthAccount(web3);
@@ -111,7 +111,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const owner = await createEthAccountWithBalance(api, web3);
@@ -166,7 +166,7 @@
name: 'token name',
mode: {type: 'Fungible', decimalPoints: 0},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const receiver = await createEthAccountWithBalance(api, web3);
tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -39,7 +39,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
@@ -55,7 +55,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});
@@ -73,7 +73,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});
@@ -92,7 +92,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const receiver = createEthAccount(web3);
@@ -133,7 +133,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const receiver = createEthAccount(web3);
@@ -196,7 +196,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const address = collectionIdToAddress(collection);
@@ -228,7 +228,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const spender = createEthAccount(web3);
@@ -258,7 +258,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const owner = await createEthAccountWithBalance(api, web3);
@@ -302,7 +302,7 @@
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const receiver = createEthAccount(web3);
tests/src/eth/sponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/sponsoring.test.ts
+++ b/tests/src/eth/sponsoring.test.ts
@@ -19,7 +19,7 @@
describe('EVM sponsoring', () => {
itWeb3('Fee is deducted from contract if sponsoring is enabled', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const caller = createEthAccount(web3);
@@ -50,7 +50,7 @@
expect(await web3.eth.getBalance(flipper.options.address)).to.be.not.equals(originalFlipperBalance);
});
itWeb3('...but this doesn\'t applies to payable value', async ({api, web3, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const owner = await createEthAccountWithBalance(api, web3);
const caller = await createEthAccountWithBalance(api, web3);
tests/src/eth/tokenProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -6,7 +6,7 @@
describe('EVM token properties', () => {
itWeb3('Can be reconfigured', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
@@ -24,7 +24,7 @@
}
});
itWeb3('Can be set', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
const token = await createItemExpectSuccess(alice, collection, 'NFT');
@@ -47,7 +47,7 @@
expect(value).to.equal('testValue');
});
itWeb3('Can be deleted', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = await createEthAccountWithBalance(api, web3);
const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
const token = await createItemExpectSuccess(alice, collection, 'NFT');
@@ -72,7 +72,7 @@
expect(result.length).to.equal(0);
});
itWeb3('Can be read', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const caller = createEthAccount(web3);
const collection = await createCollectionExpectSuccess({mode: {type:'NFT'}});
const token = await createItemExpectSuccess(alice, collection, 'NFT');
tests/src/eth/util/helpers.tsdiffbeforeafterboth--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -127,7 +127,7 @@
expect(result.success).to.be.true;
}
-export async function itWeb3(name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean } = {}) {
+export async function itWeb3(name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean } = {}) {
let i: any = it;
if (opts.only) i = i.only;
else if (opts.skip) i = i.skip;
@@ -139,8 +139,8 @@
});
});
}
-itWeb3.only = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {only: true});
-itWeb3.skip = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {skip: true});
+itWeb3.only = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {only: true});
+itWeb3.skip = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {skip: true});
export async function generateSubstrateEthPair(web3: Web3) {
const account = web3.eth.accounts.create();
tests/src/inflation.test.tsdiffbeforeafterboth--- a/tests/src/inflation.test.ts
+++ b/tests/src/inflation.test.ts
@@ -27,11 +27,11 @@
// Make sure non-sudo can't start inflation
const tx = api.tx.inflation.startInflation(1);
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
// Start inflation on relay block 1 (Alice is sudo)
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const sudoTx = api.tx.sudo.sudo(tx as any);
await submitTransactionAsync(alice, sudoTx);
tests/src/limits.test.tsdiffbeforeafterboth--- a/tests/src/limits.test.ts
+++ b/tests/src/limits.test.ts
@@ -35,7 +35,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
@@ -69,7 +69,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
@@ -103,9 +103,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -166,9 +166,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -233,9 +233,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -296,9 +296,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -337,9 +337,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -369,9 +369,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
tests/src/mintModes.test.tsdiffbeforeafterboth--- a/tests/src/mintModes.test.ts
+++ b/tests/src/mintModes.test.ts
@@ -33,8 +33,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -112,8 +112,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
tests/src/nesting/graphs.test.tsdiffbeforeafterboth--- a/tests/src/nesting/graphs.test.ts
+++ b/tests/src/nesting/graphs.test.ts
@@ -34,7 +34,7 @@
describe('Graphs', () => {
it('Ouroboros can\'t be created in a complex graph', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const collection = await buildComplexObjectGraph(api, alice);
// to self
tests/src/nesting/migration-check.test.tsdiffbeforeafterboth--- a/tests/src/nesting/migration-check.test.ts
+++ b/tests/src/nesting/migration-check.test.ts
@@ -13,7 +13,7 @@
before(async() => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
tests/src/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/nesting/nest.test.ts
+++ b/tests/src/nesting/nest.test.ts
@@ -23,8 +23,8 @@
describe('Integration Test: Nesting', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -226,8 +226,8 @@
describe('Negative Test: Nesting', async() => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
tests/src/nesting/properties.test.tsdiffbeforeafterboth--- a/tests/src/nesting/properties.test.ts
+++ b/tests/src/nesting/properties.test.ts
@@ -16,8 +16,8 @@
describe('Composite Properties Test', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -63,8 +63,8 @@
describe('Integration Test: Collection Properties', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -158,8 +158,8 @@
describe('Negative Integration Test: Collection Properties', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -290,8 +290,8 @@
describe('Integration Test: Access Rights to Token Properties', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -356,8 +356,8 @@
describe('Negative Integration Test: Access Rights to Token Properties', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -474,9 +474,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
permissions = [
{permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob]},
@@ -639,10 +639,10 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
- const dave = privateKeyWrapper!('//Dave');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
+ const dave = privateKeyWrapper('//Dave');
constitution = [
{permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob], sinner: charlie},
tests/src/nesting/rules-smoke.test.tsdiffbeforeafterboth--- a/tests/src/nesting/rules-smoke.test.ts
+++ b/tests/src/nesting/rules-smoke.test.ts
@@ -9,8 +9,8 @@
let nestTarget!: CrossAccountId;
before(async() => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const events = await executeTransaction(api, alice, api.tx.unique.createCollectionEx({
mode: 'NFT',
permissions: {
tests/src/nesting/unnest.test.tsdiffbeforeafterboth--- a/tests/src/nesting/unnest.test.ts
+++ b/tests/src/nesting/unnest.test.ts
@@ -19,8 +19,8 @@
describe('Integration Test: Unnesting', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -110,8 +110,8 @@
describe('Negative Test: Unnesting', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
tests/src/nextSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/nextSponsoring.test.ts
+++ b/tests/src/nextSponsoring.test.ts
@@ -40,8 +40,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
tests/src/overflow.test.tsdiffbeforeafterboth--- a/tests/src/overflow.test.ts
+++ b/tests/src/overflow.test.ts
@@ -30,9 +30,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
tests/src/removeCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -26,8 +26,8 @@
it('Remove collection admin.', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
// first - add collection admin Bob
@@ -49,9 +49,9 @@
it('Remove collection admin by admin.', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
// first - add collection admin Bob
@@ -75,7 +75,7 @@
it('Remove admin from collection that has no admins', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const collectionId = await createCollectionExpectSuccess();
const adminListBeforeAddAdmin = await getAdminList(api, collectionId);
@@ -92,8 +92,8 @@
await usingApi(async (api, privateKeyWrapper) => {
// tslint:disable-next-line: no-bitwise
const collectionId = (1 << 32) - 1;
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
const changeOwnerTx = api.tx.unique.removeCollectionAdmin(collectionId, normalizeAccountId(bob.address));
await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -107,8 +107,8 @@
await usingApi(async (api, privateKeyWrapper) => {
// tslint:disable-next-line: no-bitwise
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
await destroyCollectionExpectSuccess(collectionId);
@@ -123,9 +123,9 @@
it('Regular user Can\'t remove collection admin', async () => {
await usingApi(async (api, privateKeyWrapper) => {
const collectionId = await createCollectionExpectSuccess();
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
const addAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
await submitTransactionAsync(alice, addAdminTx);
tests/src/removeFromAllowList.test.tsdiffbeforeafterboth--- a/tests/src/removeFromAllowList.test.ts
+++ b/tests/src/removeFromAllowList.test.ts
@@ -41,8 +41,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -75,8 +75,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -107,9 +107,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
tests/src/removeFromContractAllowList.test.tsdiffbeforeafterboth--- a/tests/src/removeFromContractAllowList.test.ts
+++ b/tests/src/removeFromContractAllowList.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- bob = privateKeyWrapper!('//Bob');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -70,8 +70,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
tests/src/rpc.load.tsdiffbeforeafterboth--- a/tests/src/rpc.load.ts
+++ b/tests/src/rpc.load.ts
@@ -126,7 +126,7 @@
const [contract, deployer] = await deployLoadTester(api);
// Fill smart contract up with data
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const tx = contract.tx.bloat(value, gasLimit, 200);
await submitTransactionAsync(bob, tx);
tests/src/scheduler.test.tsdiffbeforeafterboth--- a/tests/src/scheduler.test.ts
+++ b/tests/src/scheduler.test.ts
@@ -30,8 +30,8 @@
describe.skip('Integration Test scheduler base transaction', () => {
it('User can transfer owned token with delay (scheduler)', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
tests/src/setChainLimits.test.tsdiffbeforeafterboth--- a/tests/src/setChainLimits.test.ts
+++ b/tests/src/setChainLimits.test.ts
@@ -31,9 +31,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- dave = privateKeyWrapper!('//Dave');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ dave = privateKeyWrapper('//Dave');
limits = {
collectionNumbersLimit : 1,
accountTokenOwnershipLimit: 1,
tests/src/setContractSponsoringRateLimit.test.tsdiffbeforeafterboth--- a/tests/src/setContractSponsoringRateLimit.test.ts
+++ b/tests/src/setContractSponsoringRateLimit.test.ts
@@ -57,7 +57,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
});
tests/src/setMintPermission.test.tsdiffbeforeafterboth--- a/tests/src/setMintPermission.test.ts
+++ b/tests/src/setMintPermission.test.ts
@@ -35,8 +35,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -75,8 +75,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
tests/src/setPublicAccessMode.test.tsdiffbeforeafterboth--- a/tests/src/setPublicAccessMode.test.ts
+++ b/tests/src/setPublicAccessMode.test.ts
@@ -41,8 +41,8 @@
describe('Integration Test setPublicAccessMode(): ', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -108,8 +108,8 @@
describe('Negative Integration Test ext. collection admin setPublicAccessMode(): ', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
it('setPublicAccessMode by collection admin', async () => {
tests/src/substrate/substrate-api.tsdiffbeforeafterboth--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -59,7 +59,7 @@
};
}
-export default async function usingApi<T = void>(action: (api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair) => Promise<T>, settings: ApiOptions | undefined = undefined): Promise<T> {
+export default async function usingApi<T = void>(action: (api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair) => Promise<T>, settings: ApiOptions | undefined = undefined): Promise<T> {
settings = settings || defaultApiOptions();
const api: ApiPromise = new ApiPromise(settings);
let result: T = null as unknown as T;
tests/src/toggleContractAllowList.test.tsdiffbeforeafterboth--- a/tests/src/toggleContractAllowList.test.ts
+++ b/tests/src/toggleContractAllowList.test.ts
@@ -50,7 +50,7 @@
it('Only allowlisted account can call contract', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const [contract, deployer] = await deployFlipper(api);
@@ -135,8 +135,8 @@
it('Enable allow list for a non-contract', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bobGuineaPig = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bobGuineaPig = privateKeyWrapper('//Bob');
const enabledBefore = (await api.query.unique.contractAllowListEnabled(bobGuineaPig.address)).toJSON();
const enableAllowListTx = api.tx.unique.toggleContractAllowList(bobGuineaPig.address, true);
@@ -150,7 +150,7 @@
it('Enable allow list using a non-owner address', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const bob = privateKeyWrapper!('//Bob');
+ const bob = privateKeyWrapper('//Bob');
const [contract] = await deployFlipper(api);
const enabledBefore = (await api.query.unique.contractAllowListEnabled(contract.address)).toJSON();
tests/src/transfer.nload.tsdiffbeforeafterboth--- a/tests/src/transfer.nload.ts
+++ b/tests/src/transfer.nload.ts
@@ -95,10 +95,10 @@
const waiting: Promise<void>[] = [];
console.log(`Starting ${os.cpus().length} workers`);
usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
for (const id in os.cpus()) {
const WORKER_NAME = `//LoadWorker${id}_${Date.now()}`;
- const workerAccount = privateKeyWrapper!(WORKER_NAME);
+ const workerAccount = privateKeyWrapper(WORKER_NAME);
const tx = api.tx.balances.transfer(workerAccount.address, 400n * 10n ** 23n);
await submitTransactionAsync(alice, tx);
@@ -119,7 +119,7 @@
} else {
increaseCounter('startedWorkers', 1);
usingApi(async (api, privateKeyWrapper) => {
- await distributeBalance(privateKeyWrapper!(process.env.WORKER_NAME as string), api, 400n * 10n ** 22n, 10);
+ await distributeBalance(privateKeyWrapper(process.env.WORKER_NAME as string), api, 400n * 10n ** 22n, 10);
});
const interval = setInterval(() => {
flushCounterToMaster();
tests/src/transfer.test.tsdiffbeforeafterboth--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -51,7 +51,7 @@
await usingApi(async (api, privateKeyWrapper) => {
const [alicesBalanceBefore, bobsBalanceBefore] = await getBalance(api, [alicesPublicKey, bobsPublicKey]);
- const alicePrivateKey = privateKeyWrapper!('//Alice');
+ const alicePrivateKey = privateKeyWrapper('//Alice');
const transfer = api.tx.balances.transfer(bobsPublicKey, 1n);
const events = await submitTransactionAsync(alicePrivateKey, transfer);
@@ -87,8 +87,8 @@
it('User can transfer owned token', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
@@ -114,8 +114,8 @@
it('Collection admin can transfer owned token', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
await addCollectionAdminExpectSuccess(alice, nftCollectionId, bob.address);
@@ -145,9 +145,9 @@
describe('Negative Integration Test Transfer(recipient, collection_id, item_id, value)', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
it('Transfer with not existed collection_id', async () => {
@@ -258,8 +258,8 @@
describe('Zero value transfer(From)', () => {
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -316,7 +316,7 @@
describe('Transfers to self (potentially over substrate-evm boundary)', () => {
itWeb3('Transfers to self. In case of same frontend', async ({api, privateKeyWrapper}) => {
const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const aliceProxy = subToEth(alice.address);
const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
await transferExpectSuccess(collectionId, tokenId, alice, {Ethereum: aliceProxy}, 10, 'Fungible');
@@ -328,7 +328,7 @@
itWeb3('Transfers to self. In case of substrate-evm boundary', async ({api, privateKeyWrapper}) => {
const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const aliceProxy = subToEth(alice.address);
const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
const balanceAliceBefore = await getTokenBalance(api, collectionId, normalizeAccountId(alice), tokenId);
@@ -340,7 +340,7 @@
itWeb3('Transfers to self. In case of inside substrate-evm', async ({api, privateKeyWrapper}) => {
const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
const balanceAliceBefore = await getTokenBalance(api, collectionId, normalizeAccountId(alice), tokenId);
await transferExpectSuccess(collectionId, tokenId, alice, alice , 10, 'Fungible');
@@ -351,7 +351,7 @@
itWeb3('Transfers to self. In case of inside substrate-evm when not enought "Fungibles"', async ({api, privateKeyWrapper}) => {
const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
const balanceAliceBefore = await getTokenBalance(api, collectionId, normalizeAccountId(alice), tokenId);
await transferExpectFailure(collectionId, tokenId, alice, alice , 11);
tests/src/transferFrom.test.tsdiffbeforeafterboth--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -43,9 +43,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -83,9 +83,9 @@
it('Should reduce allowance if value is big', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
- const charlie = privateKeyWrapper!('//Charlie');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
+ const charlie = privateKeyWrapper('//Charlie');
// fungible
const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
@@ -112,9 +112,9 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
- charlie = privateKeyWrapper!('//Charlie');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ charlie = privateKeyWrapper('//Charlie');
});
});
@@ -216,7 +216,7 @@
it('execute transferFrom from account that is not owner of collection', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const dave = privateKeyWrapper!('//Dave');
+ const dave = privateKeyWrapper('//Dave');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -329,7 +329,7 @@
const collectionCountBefore = await getCreatedCollectionCount(api);
// Run the CreateCollection transaction
- const alicePrivateKey = privateKeyWrapper!('//Alice');
+ const alicePrivateKey = privateKeyWrapper('//Alice');
let modeprm = {};
if (mode.type === 'NFT') {
@@ -382,7 +382,7 @@
const collectionCountBefore = await getCreatedCollectionCount(api);
// Run the CreateCollection transaction
- const alicePrivateKey = privateKeyWrapper!('//Alice');
+ const alicePrivateKey = privateKeyWrapper('//Alice');
let modeprm = {};
if (mode.type === 'NFT') {
@@ -430,7 +430,7 @@
const collectionCountBefore = await getCreatedCollectionCount(api);
// Run the CreateCollection transaction
- const alicePrivateKey = privateKeyWrapper!('//Alice');
+ const alicePrivateKey = privateKeyWrapper('//Alice');
let modeprm = {};
if (mode.type === 'NFT') {
@@ -469,7 +469,7 @@
const collectionCountBefore = await getCreatedCollectionCount(api);
// Run the CreateCollection transaction
- const alicePrivateKey = privateKeyWrapper!('//Alice');
+ const alicePrivateKey = privateKeyWrapper('//Alice');
const tx = api.tx.unique.createCollectionEx({name: strToUTF16(name), description: strToUTF16(description), tokenPrefix: strToUTF16(tokenPrefix), mode: modeprm as any});
await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
@@ -520,7 +520,7 @@
export async function destroyCollectionExpectFailure(collectionId: number, senderSeed = '//Alice') {
await usingApi(async (api, privateKeyWrapper) => {
// Run the DestroyCollection transaction
- const alicePrivateKey = privateKeyWrapper!(senderSeed);
+ const alicePrivateKey = privateKeyWrapper(senderSeed);
const tx = api.tx.unique.destroyCollection(collectionId);
await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
});
@@ -529,7 +529,7 @@
export async function destroyCollectionExpectSuccess(collectionId: number, senderSeed = '//Alice') {
await usingApi(async (api, privateKeyWrapper) => {
// Run the DestroyCollection transaction
- const alicePrivateKey = privateKeyWrapper!(senderSeed);
+ const alicePrivateKey = privateKeyWrapper(senderSeed);
const tx = api.tx.unique.destroyCollection(collectionId);
const events = await submitTransactionAsync(alicePrivateKey, tx);
const result = getDestroyResult(events);
@@ -574,7 +574,7 @@
await usingApi(async (api, privateKeyWrapper) => {
// Run the transaction
- const senderPrivateKey = privateKeyWrapper!(sender);
+ const senderPrivateKey = privateKeyWrapper(sender);
const tx = api.tx.unique.setCollectionSponsor(collectionId, sponsor);
const events = await submitTransactionAsync(senderPrivateKey, tx);
const result = getGenericResult(events);
@@ -594,7 +594,7 @@
await usingApi(async (api, privateKeyWrapper) => {
// Run the transaction
- const alicePrivateKey = privateKeyWrapper!(sender);
+ const alicePrivateKey = privateKeyWrapper(sender);
const tx = api.tx.unique.removeCollectionSponsor(collectionId);
const events = await submitTransactionAsync(alicePrivateKey, tx);
const result = getGenericResult(events);
@@ -612,7 +612,7 @@
await usingApi(async (api, privateKeyWrapper) => {
// Run the transaction
- const alicePrivateKey = privateKeyWrapper!(senderSeed);
+ const alicePrivateKey = privateKeyWrapper(senderSeed);
const tx = api.tx.unique.removeCollectionSponsor(collectionId);
await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
});
@@ -622,7 +622,7 @@
await usingApi(async (api, privateKeyWrapper) => {
// Run the transaction
- const alicePrivateKey = privateKeyWrapper!(senderSeed);
+ const alicePrivateKey = privateKeyWrapper(senderSeed);
const tx = api.tx.unique.setCollectionSponsor(collectionId, sponsor);
await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
});
@@ -632,7 +632,7 @@
await usingApi(async (api, privateKeyWrapper) => {
// Run the transaction
- const sender = privateKeyWrapper!(senderSeed);
+ const sender = privateKeyWrapper(senderSeed);
const tx = api.tx.unique.confirmSponsorship(collectionId);
const events = await submitTransactionAsync(sender, tx);
const result = getGenericResult(events);
@@ -653,7 +653,7 @@
await usingApi(async (api, privateKeyWrapper) => {
// Run the transaction
- const sender = privateKeyWrapper!(senderSeed);
+ const sender = privateKeyWrapper(senderSeed);
const tx = api.tx.unique.confirmSponsorship(collectionId);
await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
});
tests/src/xcmTransfer.test.tsdiffbeforeafterboth--- a/tests/src/xcmTransfer.test.ts
+++ b/tests/src/xcmTransfer.test.ts
@@ -38,7 +38,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
+ alice = privateKeyWrapper('//Alice');
});
const karuraApiOptions: ApiOptions = {