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.tsdiffbeforeafterboth--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -45,7 +45,7 @@
const itemsListIndexBefore = await getLastTokenId(api, collectionId);
expect(itemsListIndexBefore).to.be.equal(0);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
await submitTransactionAsync(
alice,
api.tx.unique.setPropertyPermissions(collectionId, [{key: 'data', permission: {tokenOwner: true}}]),
@@ -76,7 +76,7 @@
const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
const itemsListIndexBefore = await getLastTokenId(api, collectionId);
expect(itemsListIndexBefore).to.be.equal(0);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const args = [
{Fungible: {value: 1}},
{Fungible: {value: 2}},
@@ -96,7 +96,7 @@
const collectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
const itemsListIndexBefore = await getLastTokenId(api, collectionId);
expect(itemsListIndexBefore).to.be.equal(0);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const args = [
{ReFungible: {pieces: 1}},
{ReFungible: {pieces: 2}},
@@ -116,7 +116,7 @@
it('Can mint amount of items equals to collection limits', async () => {
await usingApi(async (api, privateKeyWrapper) => {
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const collectionId = await createCollectionExpectSuccess();
await setCollectionLimitsExpectSuccess(alice, collectionId, {
@@ -138,7 +138,7 @@
const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: false}}]});
const itemsListIndexBefore = await getLastTokenId(api, collectionId);
expect(itemsListIndexBefore).to.be.equal(0);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const args = [
{NFT: {properties: [{key: 'k', value: 'v1'}]}},
{NFT: {properties: [{key: 'k', value: 'v2'}]}},
@@ -164,8 +164,8 @@
const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: false, collectionAdmin: true, tokenOwner: false}}]});
const itemsListIndexBefore = await getLastTokenId(api, collectionId);
expect(itemsListIndexBefore).to.be.equal(0);
- const alice = privateKeyWrapper!('//Alice');
- const bob = privateKeyWrapper!('//Bob');
+ const alice = privateKeyWrapper('//Alice');
+ const bob = privateKeyWrapper('//Bob');
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
const args = [
{NFT: {properties: [{key: 'k', value: 'v1'}]}},
@@ -192,7 +192,7 @@
const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});
const itemsListIndexBefore = await getLastTokenId(api, collectionId);
expect(itemsListIndexBefore).to.be.equal(0);
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const args = [
{NFT: {properties: [{key: 'k', value: 'v1'}]}},
{NFT: {properties: [{key: 'k', value: 'v2'}]}},
@@ -220,8 +220,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -302,8 +302,8 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper!('//Alice');
- bob = privateKeyWrapper!('//Bob');
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
@@ -364,7 +364,7 @@
const collectionId = await createCollectionWithPropsExpectSuccess({
propPerm: [{key: 'key', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}],
});
- const alice = privateKeyWrapper!('//Alice');
+ const alice = privateKeyWrapper('//Alice');
const args = [
{NFT: {properties: [{key: 'key', value: 'A'.repeat(32769)}]}},
{NFT: {properties: [{key: 'key', value: 'B'.repeat(32769)}]}},
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.tsdiffbeforeafterboth1import {expect} from 'chai';2import usingApi, {executeTransaction} from '../substrate/substrate-api';3import {4 addCollectionAdminExpectSuccess,5 createCollectionExpectSuccess,6 createItemExpectSuccess,7 getCreateCollectionResult,8 transferExpectSuccess,9} from '../util/helpers';10import {IKeyringPair} from '@polkadot/types/types';1112let alice: IKeyringPair;13let bob: IKeyringPair;14let charlie: IKeyringPair;1516describe('Composite Properties Test', () => {17 before(async () => {18 await usingApi(async (api, privateKeyWrapper) => {19 alice = privateKeyWrapper!('//Alice');20 bob = privateKeyWrapper!('//Bob');21 });22 });2324 it('Makes sure collectionById supplies required fields', async () => {25 await usingApi(async api => {26 const collectionId = await createCollectionExpectSuccess();2728 const collectionOption = await api.rpc.unique.collectionById(collectionId);29 expect(collectionOption.isSome).to.be.true;30 let collection = collectionOption.unwrap();31 expect(collection.tokenPropertyPermissions.toHuman()).to.be.empty;32 expect(collection.properties.toHuman()).to.be.empty;3334 const propertyPermissions = [35 {key: 'mindgame', permission: {collectionAdmin: true, mutable: false, tokenOwner: true}},36 {key: 'skullduggery', permission: {collectionAdmin: false, mutable: true, tokenOwner: false}},37 ];38 await expect(executeTransaction(39 api, 40 alice, 41 api.tx.unique.setPropertyPermissions(collectionId, propertyPermissions), 42 )).to.not.be.rejected;4344 const collectionProperties = [45 {key: 'black_hole', value: 'LIGO'},46 {key: 'electron', value: 'come bond'}, 47 ];48 await expect(executeTransaction(49 api, 50 alice, 51 api.tx.unique.setCollectionProperties(collectionId, collectionProperties), 52 )).to.not.be.rejected;5354 collection = (await api.rpc.unique.collectionById(collectionId)).unwrap();55 expect(collection.tokenPropertyPermissions.toHuman()).to.be.deep.equal(propertyPermissions);56 expect(collection.properties.toHuman()).to.be.deep.equal(collectionProperties);57 });58 });59});6061// ---------- COLLECTION PROPERTIES6263describe('Integration Test: Collection Properties', () => {64 before(async () => {65 await usingApi(async (api, privateKeyWrapper) => {66 alice = privateKeyWrapper!('//Alice');67 bob = privateKeyWrapper!('//Bob');68 });69 });7071 it('Reads properties from a collection', async () => {72 await usingApi(async api => {73 const collection = await createCollectionExpectSuccess();74 const properties = (await api.query.common.collectionProperties(collection)).toJSON();75 expect(properties.map).to.be.empty;76 expect(properties.consumedSpace).to.equal(0);77 });78 });7980 it('Sets properties for a collection', async () => {81 await usingApi(async api => {82 const events = await executeTransaction(api, bob, api.tx.unique.createCollectionEx({mode: 'NFT'}));83 const {collectionId} = getCreateCollectionResult(events);8485 // As owner86 await expect(executeTransaction(87 api, 88 bob, 89 api.tx.unique.setCollectionProperties(collectionId, [{key: 'electron', value: 'come bond'}]), 90 )).to.not.be.rejected;9192 await addCollectionAdminExpectSuccess(bob, collectionId, alice.address);9394 // As administrator95 await expect(executeTransaction(96 api, 97 alice, 98 api.tx.unique.setCollectionProperties(collectionId, [{key: 'black_hole'}]), 99 )).to.not.be.rejected;100101 const properties = (await api.rpc.unique.collectionProperties(collectionId, ['electron', 'black_hole'])).toHuman();102 expect(properties).to.be.deep.equal([103 {key: 'electron', value: 'come bond'},104 {key: 'black_hole', value: ''},105 ]);106 });107 });108109 it('Changes properties of a collection', async () => {110 await usingApi(async api => {111 const collection = await createCollectionExpectSuccess();112113 await expect(executeTransaction(114 api, 115 alice, 116 api.tx.unique.setCollectionProperties(collection, [{key: 'electron', value: 'come bond'}, {key: 'black_hole'}]), 117 )).to.not.be.rejected;118119 // Mutate the properties120 await expect(executeTransaction(121 api, 122 alice, 123 api.tx.unique.setCollectionProperties(collection, [{key: 'electron', value: 'bonded'}, {key: 'black_hole', value: 'LIGO'}]), 124 )).to.not.be.rejected;125126 const properties = (await api.rpc.unique.collectionProperties(collection, ['electron', 'black_hole'])).toHuman();127 expect(properties).to.be.deep.equal([128 {key: 'electron', value: 'bonded'},129 {key: 'black_hole', value: 'LIGO'},130 ]);131 });132 });133134 it('Deletes properties of a collection', async () => {135 await usingApi(async api => {136 const collection = await createCollectionExpectSuccess();137138 await expect(executeTransaction(139 api, 140 alice, 141 api.tx.unique.setCollectionProperties(collection, [{key: 'electron', value: 'come bond'}, {key: 'black_hole', value: 'LIGO'}]), 142 )).to.not.be.rejected;143144 await expect(executeTransaction(145 api, 146 alice, 147 api.tx.unique.deleteCollectionProperties(collection, ['electron']), 148 )).to.not.be.rejected;149150 const properties = (await api.rpc.unique.collectionProperties(collection, ['electron', 'black_hole'])).toHuman();151 expect(properties).to.be.deep.equal([152 {key: 'black_hole', value: 'LIGO'},153 ]);154 });155 });156});157158describe('Negative Integration Test: Collection Properties', () => {159 before(async () => {160 await usingApi(async (api, privateKeyWrapper) => {161 alice = privateKeyWrapper!('//Alice');162 bob = privateKeyWrapper!('//Bob');163 });164 });165 166 it('Fails to set properties in a collection if not its onwer/administrator', async () => {167 await usingApi(async api => {168 const collection = await createCollectionExpectSuccess();169170 await expect(executeTransaction(171 api, 172 bob, 173 api.tx.unique.setCollectionProperties(collection, [{key: 'electron', value: 'come bond'}, {key: 'black_hole', value: 'LIGO'}]), 174 )).to.be.rejectedWith(/common\.NoPermission/);175 176 const properties = (await api.query.common.collectionProperties(collection)).toJSON();177 expect(properties.map).to.be.empty;178 expect(properties.consumedSpace).to.equal(0);179 });180 });181 182 it('Fails to set properties that exceed the limits', async () => {183 await usingApi(async api => {184 const collection = await createCollectionExpectSuccess();185 const spaceLimit = (await api.query.common.collectionProperties(collection)).toJSON().spaceLimit as number; 186187 // Mute the general tx parsing error, too many bytes to process188 {189 console.error = () => {};190 await expect(executeTransaction(191 api, 192 alice, 193 api.tx.unique.setCollectionProperties(collection, [{key: 'electron', value: 'low high '.repeat(Math.ceil(spaceLimit! / 9))}]), 194 )).to.be.rejected;195 }196197 let properties = (await api.rpc.unique.collectionProperties(collection, ['electron'])).toJSON();198 expect(properties).to.be.empty;199200 await expect(executeTransaction(201 api, 202 alice, 203 api.tx.unique.setCollectionProperties(collection, [204 {key: 'electron', value: 'low high '.repeat(Math.ceil(spaceLimit! / 18))}, 205 {key: 'black_hole', value: '0'.repeat(Math.ceil(spaceLimit! / 2))}, 206 ]), 207 )).to.be.rejectedWith(/common\.NoSpaceForProperty/);208209 properties = (await api.rpc.unique.collectionProperties(collection, ['electron', 'black hole'])).toJSON();210 expect(properties).to.be.empty;211 });212 });213 214 it('Fails to set more properties than it is allowed', async () => {215 await usingApi(async api => {216 const collection = await createCollectionExpectSuccess();217218 const propertiesToBeSet = [];219 for (let i = 0; i < 65; i++) {220 propertiesToBeSet.push({221 key: 'electron_' + i,222 value: Math.random() > 0.5 ? 'high' : 'low',223 });224 }225226 await expect(executeTransaction(227 api, 228 alice, 229 api.tx.unique.setCollectionProperties(collection, propertiesToBeSet), 230 )).to.be.rejectedWith(/common\.PropertyLimitReached/);231232 const properties = (await api.query.common.collectionProperties(collection)).toJSON();233 expect(properties.map).to.be.empty;234 expect(properties.consumedSpace).to.equal(0);235 });236 });237238 it('Fails to set properties with invalid names', async () => {239 await usingApi(async api => {240 const collection = await createCollectionExpectSuccess();241242 const invalidProperties = [243 [{key: 'electron', value: 'negative'}, {key: 'string theory', value: 'understandable'}],244 [{key: 'Mr.Sandman', value: 'Bring me a gene'}],245 [{key: 'déjà vu', value: 'hmm...'}],246 ];247248 for (let i = 0; i < invalidProperties.length; i++) {249 await expect(executeTransaction(250 api, 251 alice, 252 api.tx.unique.setCollectionProperties(collection, invalidProperties[i]), 253 ), `on rejecting the new badly-named property #${i}`).to.be.rejectedWith(/common\.InvalidCharacterInPropertyKey/);254 }255256 await expect(executeTransaction(257 api, 258 alice, 259 api.tx.unique.setCollectionProperties(collection, [{key: '', value: 'nothing must not exist'}]), 260 ), 'on rejecting an unnamed property').to.be.rejectedWith(/common\.EmptyPropertyKey/);261262 await expect(executeTransaction(263 api, 264 alice, 265 api.tx.unique.setCollectionProperties(collection, [266 {key: 'CRISPR-Cas9', value: 'rewriting nature!'},267 ]), 268 ), 'on setting the correctly-but-still-badly-named property').to.not.be.rejected;269270 const keys = invalidProperties.flatMap(propertySet => propertySet.map(property => property.key)).concat('CRISPR-Cas9').concat('');271272 const properties = (await api.rpc.unique.collectionProperties(collection, keys)).toHuman();273 expect(properties).to.be.deep.equal([274 {key: 'CRISPR-Cas9', value: 'rewriting nature!'},275 ]);276277 for (let i = 0; i < invalidProperties.length; i++) {278 await expect(executeTransaction(279 api, 280 alice, 281 api.tx.unique.deleteCollectionProperties(collection, invalidProperties[i].map(propertySet => propertySet.key)), 282 ), `on trying to delete the non-existent badly-named property #${i}`).to.be.rejectedWith(/common\.InvalidCharacterInPropertyKey/);283 }284 });285 });286});287288// ---------- ACCESS RIGHTS289290describe('Integration Test: Access Rights to Token Properties', () => {291 before(async () => {292 await usingApi(async (api, privateKeyWrapper) => {293 alice = privateKeyWrapper!('//Alice');294 bob = privateKeyWrapper!('//Bob');295 });296 });297 298 it('Reads access rights to properties of a collection', async () => {299 await usingApi(async api => {300 const collection = await createCollectionExpectSuccess();301 const propertyRights = (await api.query.common.collectionPropertyPermissions(collection)).toJSON();302 expect(propertyRights).to.be.empty;303 });304 });305 306 it('Sets access rights to properties of a collection', async () => {307 await usingApi(async api => {308 const collection = await createCollectionExpectSuccess();309310 await expect(executeTransaction(311 api, 312 alice, 313 api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true}}]), 314 )).to.not.be.rejected;315316 await addCollectionAdminExpectSuccess(alice, collection, bob.address);317318 await expect(executeTransaction(319 api, 320 alice, 321 api.tx.unique.setPropertyPermissions(collection, [{key: 'mindgame', permission: {collectionAdmin: true, tokenOwner: false}}]), 322 )).to.not.be.rejected;323324 const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery', 'mindgame'])).toHuman();325 expect(propertyRights).to.be.deep.equal([326 {key: 'skullduggery', permission: {'mutable': true, 'collectionAdmin': false, 'tokenOwner': false}},327 {key: 'mindgame', permission: {'mutable': false, 'collectionAdmin': true, 'tokenOwner': false}},328 ]);329 });330 });331 332 it('Changes access rights to properties of a collection', async () => {333 await usingApi(async api => {334 const collection = await createCollectionExpectSuccess();335336 await expect(executeTransaction(337 api, 338 alice, 339 api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true, collectionAdmin: true}}]), 340 )).to.not.be.rejected;341342 await expect(executeTransaction(343 api, 344 alice, 345 api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]), 346 )).to.not.be.rejected;347348 const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery'])).toHuman();349 expect(propertyRights).to.be.deep.equal([350 {key: 'skullduggery', permission: {'mutable': false, 'collectionAdmin': false, 'tokenOwner': true}},351 ]);352 });353 });354});355356describe('Negative Integration Test: Access Rights to Token Properties', () => {357 before(async () => {358 await usingApi(async (api, privateKeyWrapper) => {359 alice = privateKeyWrapper!('//Alice');360 bob = privateKeyWrapper!('//Bob');361 });362 });363364 it('Prevents from setting access rights to properties of a collection if not an onwer/admin', async () => {365 await usingApi(async api => {366 const collection = await createCollectionExpectSuccess();367368 await expect(executeTransaction(369 api, 370 bob, 371 api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true, tokenOwner: true}}]), 372 )).to.be.rejectedWith(/common\.NoPermission/);373374 const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery'])).toJSON();375 expect(propertyRights).to.be.empty;376 });377 });378379 it('Prevents from adding too many possible properties', async () => {380 await usingApi(async api => {381 const collection = await createCollectionExpectSuccess();382383 const constitution = [];384 for (let i = 0; i < 65; i++) {385 constitution.push({386 key: 'property_' + i,387 permission: Math.random() > 0.5 ? {mutable: true, collectionAdmin: true, tokenOwner: true} : {},388 });389 }390391 await expect(executeTransaction(392 api, 393 alice, 394 api.tx.unique.setPropertyPermissions(collection, constitution), 395 )).to.be.rejectedWith(/common\.PropertyLimitReached/);396397 const propertyRights = (await api.query.common.collectionPropertyPermissions(collection)).toJSON();398 expect(propertyRights).to.be.empty;399 });400 });401402 it('Prevents access rights to be modified if constant', async () => {403 await usingApi(async api => {404 const collection = await createCollectionExpectSuccess();405406 await expect(executeTransaction(407 api, 408 alice, 409 api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]), 410 )).to.not.be.rejected;411412 await expect(executeTransaction(413 api, 414 alice, 415 api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {}}]), 416 )).to.be.rejectedWith(/common\.NoPermission/);417418 const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery'])).toHuman();419 expect(propertyRights).to.deep.equal([420 {key: 'skullduggery', permission: {'mutable': false, 'collectionAdmin': false, 'tokenOwner': true}},421 ]);422 });423 });424425 it('Prevents adding properties with invalid names', async () => {426 await usingApi(async api => {427 const collection = await createCollectionExpectSuccess();428429 const invalidProperties = [430 [{key: 'skullduggery', permission: {tokenOwner: true}}, {key: 'im possible', permission: {collectionAdmin: true}}],431 [{key: 'G#4', permission: {tokenOwner: true}}],432 [{key: 'HÆMILTON', permission: {mutable: false, collectionAdmin: true, tokenOwner: true}}],433 ];434435 for (let i = 0; i < invalidProperties.length; i++) {436 await expect(executeTransaction(437 api, 438 alice, 439 api.tx.unique.setPropertyPermissions(collection, invalidProperties[i]), 440 ), `on setting the new badly-named property #${i}`).to.be.rejectedWith(/common\.InvalidCharacterInPropertyKey/);441 }442443 await expect(executeTransaction(444 api, 445 alice, 446 api.tx.unique.setPropertyPermissions(collection, [{key: '', permission: {}}]), 447 ), 'on rejecting an unnamed property').to.be.rejectedWith(/common\.EmptyPropertyKey/);448449 const correctKey = '--0x03116e387820CA05'; // PolkadotJS would parse this as an already encoded hex-string450 await expect(executeTransaction(451 api, 452 alice, 453 api.tx.unique.setPropertyPermissions(collection, [454 {key: correctKey, permission: {collectionAdmin: true}},455 ]), 456 ), 'on setting the correctly-but-still-badly-named property').to.not.be.rejected;457458 const keys = invalidProperties.flatMap(propertySet => propertySet.map(property => property.key)).concat(correctKey).concat('');459460 const propertyRights = (await api.rpc.unique.propertyPermissions(collection, keys)).toHuman();461 expect(propertyRights).to.be.deep.equal([462 {key: correctKey, permission: {mutable: false, collectionAdmin: true, tokenOwner: false}},463 ]);464 });465 });466});467468// ---------- TOKEN PROPERTIES469470describe('Integration Test: Token Properties', () => {471 let collection: number;472 let token: number;473 let permissions: {permission: any, signers: IKeyringPair[]}[];474475 before(async () => {476 await usingApi(async (api, privateKeyWrapper) => {477 alice = privateKeyWrapper!('//Alice');478 bob = privateKeyWrapper!('//Bob');479 charlie = privateKeyWrapper!('//Charlie');480481 permissions = [482 {permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob]},483 {permission: {mutable: false, collectionAdmin: true}, signers: [alice, bob]},484 {permission: {mutable: true, tokenOwner: true}, signers: [charlie]},485 {permission: {mutable: false, tokenOwner: true}, signers: [charlie]},486 {permission: {mutable: true, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie]},487 {permission: {mutable: false, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie]},488 ];489 });490 });491492 beforeEach(async () => {493 await usingApi(async () => {494 collection = await createCollectionExpectSuccess();495 token = await createItemExpectSuccess(alice, collection, 'NFT');496 await addCollectionAdminExpectSuccess(alice, collection, bob.address);497 await transferExpectSuccess(collection, token, alice, charlie);498 });499 });500 501 it('Reads yet empty properties of a token', async () => {502 await usingApi(async api => {503 const collection = await createCollectionExpectSuccess();504 const token = await createItemExpectSuccess(alice, collection, 'NFT');505 506 const properties = (await api.query.nonfungible.tokenProperties(collection, token)).toJSON();507 expect(properties.map).to.be.empty;508 expect(properties.consumedSpace).to.be.equal(0);509510 const tokenData = (await api.rpc.unique.tokenData(collection, token, ['anything'])).toJSON().properties;511 expect(tokenData).to.be.empty;512 });513 });514515 it('Assigns properties to a token according to permissions', async () => {516 await usingApi(async api => {517 const propertyKeys: string[] = [];518 let i = 0;519 for (const permission of permissions) {520 for (const signer of permission.signers) {521 const key = i + '_' + signer.address;522 propertyKeys.push(key);523524 await expect(executeTransaction(525 api, 526 alice, 527 api.tx.unique.setPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 528 ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;529530 await expect(executeTransaction(531 api, 532 signer, 533 api.tx.unique.setTokenProperties(collection, token, [{key: key, value: 'Serotonin increase'}]), 534 ), `on adding property ${i} by ${signer.address}`).to.not.be.rejected;535 }536537 i++;538 }539540 const properties = (await api.rpc.unique.tokenProperties(collection, token, propertyKeys)).toHuman() as any[];541 const tokensData = (await api.rpc.unique.tokenData(collection, token, propertyKeys)).toHuman().properties as any[];542 for (let i = 0; i < properties.length; i++) {543 expect(properties[i].value).to.be.equal('Serotonin increase');544 expect(tokensData[i].value).to.be.equal('Serotonin increase');545 }546 });547 });548549 it('Changes properties of a token according to permissions', async () => {550 await usingApi(async api => {551 const propertyKeys: string[] = [];552 let i = 0;553 for (const permission of permissions) {554 if (!permission.permission.mutable) continue;555 556 for (const signer of permission.signers) {557 const key = i + '_' + signer.address;558 propertyKeys.push(key);559560 await expect(executeTransaction(561 api, 562 alice, 563 api.tx.unique.setPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 564 ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;565566 await expect(executeTransaction(567 api, 568 signer, 569 api.tx.unique.setTokenProperties(collection, token, [{key: key, value: 'Serotonin increase'}]), 570 ), `on adding property ${i} by ${signer.address}`).to.not.be.rejected;571572 await expect(executeTransaction(573 api, 574 signer, 575 api.tx.unique.setTokenProperties(collection, token, [{key: key, value: 'Serotonin stable'}]), 576 ), `on changing property ${i} by ${signer.address}`).to.not.be.rejected;577 }578579 i++;580 }581582 const properties = (await api.rpc.unique.tokenProperties(collection, token, propertyKeys)).toHuman() as any[];583 const tokensData = (await api.rpc.unique.tokenData(collection, token, propertyKeys)).toHuman().properties as any[];584 for (let i = 0; i < properties.length; i++) {585 expect(properties[i].value).to.be.equal('Serotonin stable');586 expect(tokensData[i].value).to.be.equal('Serotonin stable');587 }588 });589 });590591 it('Deletes properties of a token according to permissions', async () => {592 await usingApi(async api => {593 const propertyKeys: string[] = [];594 let i = 0;595596 for (const permission of permissions) {597 if (!permission.permission.mutable) continue;598 599 for (const signer of permission.signers) {600 const key = i + '_' + signer.address;601 propertyKeys.push(key);602603 await expect(executeTransaction(604 api, 605 alice, 606 api.tx.unique.setPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 607 ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;608609 await expect(executeTransaction(610 api, 611 signer, 612 api.tx.unique.setTokenProperties(collection, token, [{key: key, value: 'Serotonin increase'}]), 613 ), `on adding property ${i} by ${signer.address}`).to.not.be.rejected;614615 await expect(executeTransaction(616 api, 617 signer, 618 api.tx.unique.deleteTokenProperties(collection, token, [key]), 619 ), `on deleting property ${i} by ${signer.address}`).to.not.be.rejected;620 }621 622 i++;623 }624625 const properties = (await api.rpc.unique.tokenProperties(collection, token, propertyKeys)).toJSON() as any[];626 expect(properties).to.be.empty;627 const tokensData = (await api.rpc.unique.tokenData(collection, token, propertyKeys)).toJSON().properties as any[];628 expect(tokensData).to.be.empty;629 expect((await api.query.nonfungible.tokenProperties(collection, token)).toJSON().consumedSpace).to.be.equal(0);630 });631 });632});633634describe('Negative Integration Test: Token Properties', () => {635 let collection: number;636 let token: number;637 let originalSpace: number;638 let constitution: {permission: any, signers: IKeyringPair[], sinner: IKeyringPair}[];639640 before(async () => {641 await usingApi(async (api, privateKeyWrapper) => {642 alice = privateKeyWrapper!('//Alice');643 bob = privateKeyWrapper!('//Bob');644 charlie = privateKeyWrapper!('//Charlie');645 const dave = privateKeyWrapper!('//Dave');646647 constitution = [648 {permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob], sinner: charlie},649 {permission: {mutable: false, collectionAdmin: true}, signers: [alice, bob], sinner: charlie},650 {permission: {mutable: true, tokenOwner: true}, signers: [charlie], sinner: alice},651 {permission: {mutable: false, tokenOwner: true}, signers: [charlie], sinner: alice},652 {permission: {mutable: true, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie], sinner: dave},653 {permission: {mutable: false, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie], sinner: dave},654 ];655 });656 });657658 beforeEach(async () => {659 collection = await createCollectionExpectSuccess();660 token = await createItemExpectSuccess(alice, collection, 'NFT');661 await addCollectionAdminExpectSuccess(alice, collection, bob.address);662 await transferExpectSuccess(collection, token, alice, charlie);663 664 await usingApi(async api => {665 let i = 0;666 for (const passage of constitution) {667 const signer = passage.signers[0];668 669 await expect(executeTransaction(670 api, 671 alice, 672 api.tx.unique.setPropertyPermissions(collection, [{key: `${i}`, permission: passage.permission}]), 673 ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;674675 await expect(executeTransaction(676 api, 677 signer, 678 api.tx.unique.setTokenProperties(collection, token, [{key: `${i}`, value: 'Serotonin increase'}]), 679 ), `on adding property ${i} by ${signer.address}`).to.not.be.rejected;680681 i++;682 }683684 originalSpace = (await api.query.nonfungible.tokenProperties(collection, token)).toJSON().consumedSpace as number;685 });686 });687688 it('Forbids changing/deleting properties of a token if the user is outside of permissions', async () => {689 await usingApi(async api => {690 let i = -1;691 for (const forbiddance of constitution) {692 i++;693 if (!forbiddance.permission.mutable) continue;694695 await expect(executeTransaction(696 api, 697 forbiddance.sinner, 698 api.tx.unique.setTokenProperties(collection, token, [{key: `${i}`, value: 'Serotonin down'}]), 699 ), `on failing to change property ${i} by ${forbiddance.sinner.address}`).to.be.rejectedWith(/common\.NoPermission/);700701 await expect(executeTransaction(702 api, 703 forbiddance.sinner, 704 api.tx.unique.deleteTokenProperties(collection, token, [`${i}`]), 705 ), `on failing to delete property ${i} by ${forbiddance.sinner.address}`).to.be.rejectedWith(/common\.NoPermission/);706 }707708 const properties = (await api.query.nonfungible.tokenProperties(collection, token)).toJSON();709 expect(properties.consumedSpace).to.be.equal(originalSpace);710 });711 });712713 it('Forbids changing/deleting properties of a token if the property is permanent (immutable)', async () => {714 await usingApi(async api => {715 let i = -1;716 for (const permission of constitution) {717 i++;718 if (permission.permission.mutable) continue;719720 await expect(executeTransaction(721 api, 722 permission.signers[0], 723 api.tx.unique.setTokenProperties(collection, token, [{key: `${i}`, value: 'Serotonin down'}]), 724 ), `on failing to change property ${i} by ${permission.signers[0].address}`).to.be.rejectedWith(/common\.NoPermission/);725726 await expect(executeTransaction(727 api, 728 permission.signers[0], 729 api.tx.unique.deleteTokenProperties(collection, token, [i.toString()]), 730 ), `on failing to delete property ${i} by ${permission.signers[0].address}`).to.be.rejectedWith(/common\.NoPermission/);731 }732733 const properties = (await api.query.nonfungible.tokenProperties(collection, token)).toJSON();734 expect(properties.consumedSpace).to.be.equal(originalSpace);735 });736 });737738 it('Forbids adding properties to a token if the property is not declared / forbidden with the \'None\' permission', async () => {739 await usingApi(async api => {740 await expect(executeTransaction(741 api, 742 alice, 743 api.tx.unique.setTokenProperties(collection, token, [{key: 'non-existent', value: 'I exist!'}]), 744 ), 'on failing to add a previously non-existent property').to.be.rejectedWith(/common\.NoPermission/);745 746 await expect(executeTransaction(747 api, 748 alice, 749 api.tx.unique.setPropertyPermissions(collection, [{key: 'now-existent', permission: {}}]), 750 ), 'on setting a new non-permitted property').to.not.be.rejected;751752 await expect(executeTransaction(753 api, 754 alice, 755 api.tx.unique.setTokenProperties(collection, token, [{key: 'now-existent', value: 'I exist!'}]), 756 ), 'on failing to add a property forbidden by the \'None\' permission').to.be.rejectedWith(/common\.NoPermission/);757758 expect((await api.rpc.unique.tokenProperties(collection, token, ['non-existent', 'now-existent'])).toJSON()).to.be.empty;759 const properties = (await api.query.nonfungible.tokenProperties(collection, token)).toJSON();760 expect(properties.consumedSpace).to.be.equal(originalSpace);761 });762 });763764 it('Forbids adding too many properties to a token', async () => {765 await usingApi(async api => {766 await expect(executeTransaction(767 api, 768 alice, 769 api.tx.unique.setPropertyPermissions(collection, [770 {key: 'a_holy_book', permission: {collectionAdmin: true, tokenOwner: true}}, 771 {key: 'young_years', permission: {collectionAdmin: true, tokenOwner: true}},772 ]), 773 ), 'on setting a new non-permitted property').to.not.be.rejected;774775 // Mute the general tx parsing error776 {777 console.error = () => {};778 await expect(executeTransaction(779 api, 780 alice, 781 api.tx.unique.setCollectionProperties(collection, [{key: 'a_holy_book', value: 'word '.repeat(6554)}]), 782 )).to.be.rejected;783 }784785 await expect(executeTransaction(786 api, 787 alice, 788 api.tx.unique.setTokenProperties(collection, token, [789 {key: 'a_holy_book', value: 'word '.repeat(3277)}, 790 {key: 'young_years', value: 'neverending'.repeat(1490)},791 ]), 792 )).to.be.rejectedWith(/common\.NoSpaceForProperty/);793794 expect((await api.rpc.unique.tokenProperties(collection, token, ['a_holy_book', 'young_years'])).toJSON()).to.be.empty;795 const propertiesMap = (await api.query.nonfungible.tokenProperties(collection, token)).toJSON();796 expect(propertiesMap.consumedSpace).to.be.equal(originalSpace);797 });798 });799});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 = {