difftreelog
tests: introduce feed alices + refactor tests to use the filename as donor key
in: master
64 files changed
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -26,24 +26,25 @@
"scripts": {
"lint": "eslint --ext .ts,.js src/",
"fix": "eslint --ext .ts,.js src/ --fix",
- "test": "mocha --timeout 9999999 -r ts-node/register './src/**/*.test.ts'",
- "testEth": "mocha --timeout 9999999 -r ts-node/register './**/eth/**/*.test.ts'",
- "testEthMarketplace": "mocha --timeout 9999999 -r ts-node/register './**/eth/marketplace/**/*.test.ts'",
- "testEthNesting": "mocha --timeout 9999999 -r ts-node/register './**/eth/nesting/**/*.test.ts'",
- "testEthFractionalizer": "mocha --timeout 9999999 -r ts-node/register './**/eth/fractionalizer/**/*.test.ts'",
+ "feedAlices": "ts-node ./src/util/playgrounds/feedAlices.ts",
+
+ "test": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './src/**/*.test.ts'",
+ "testStructure": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register ./**/nesting/**.test.ts",
+ "testEth": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/**/*.test.ts'",
+ "testEthNesting": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/nesting/**/*.test.ts'",
+ "testEthFractionalizer": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/fractionalizer/**/*.test.ts'",
+ "testEthMarketplace": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/marketplace/**/*.test.ts'",
+ "testCollision": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register ./src/collision-tests/*.test.ts",
+ "testEvent": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register ./src/check-event/*.test.ts",
+ "testRmrk": "mocha --timeout 9999999 -r ts-node/register ./**/rmrk/**.test.ts",
+
"testEthPayable": "mocha --timeout 9999999 -r ts-node/register './**/eth/payable.test.ts'",
- "load": "mocha --timeout 9999999 -r ts-node/register './**/*.load.ts'",
- "loadTransfer": "ts-node src/transfer.nload.ts",
- "testCollision": "mocha --timeout 9999999 -r ts-node/register ./src/collision-tests/*.test.ts",
- "testEvent": "mocha --timeout 9999999 -r ts-node/register ./src/check-event/*.test.ts",
+ "testEthTokenProperties": "mocha --timeout 9999999 -r ts-node/register ./**/eth/tokenProperties.test.ts",
"testNesting": "mocha --timeout 9999999 -r ts-node/register ./**/nest.test.ts",
"testUnnesting": "mocha --timeout 9999999 -r ts-node/register ./**/unnest.test.ts",
- "testStructure": "mocha --timeout 9999999 -r ts-node/register ./**/nesting/**.test.ts",
"testProperties": "mocha --timeout 9999999 -r ts-node/register ./**/properties.test.ts ./**/getPropertiesRpc.test.ts",
"testMigration": "mocha --timeout 9999999 -r ts-node/register ./**/nesting/migration-check.test.ts",
- "testRmrk": "mocha --timeout 9999999 -r ts-node/register ./**/rmrk/**.test.ts",
"testAddCollectionAdmin": "mocha --timeout 9999999 -r ts-node/register ./**/addCollectionAdmin.test.ts",
- "testSetSchemaVersion": "mocha --timeout 9999999 -r ts-node/register ./**/setSchemaVersion.test.ts",
"testSetCollectionLimits": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionLimits.test.ts",
"testChangeCollectionOwner": "mocha --timeout 9999999 -r ts-node/register ./**/change-collection-owner.test.ts",
"testSetCollectionSponsor": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionSponsor.test.ts",
@@ -96,6 +97,10 @@
"testEthFT": "mocha --timeout 9999999 -r ts-node/register ./**/eth/fungible.test.ts",
"testRPC": "mocha --timeout 9999999 -r ts-node/register ./**/rpc.test.ts",
"testPromotion": "mocha --timeout 9999999 -r ts-node/register ./**/app-promotion.test.ts",
+
+ "load": "mocha --timeout 9999999 -r ts-node/register './**/*.load.ts'",
+ "loadTransfer": "ts-node src/transfer.nload.ts",
+
"polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json",
"polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",
"polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",
tests/src/addCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -21,8 +21,8 @@
let donor: IKeyringPair;
before(async () => {
- await usingPlaygrounds(async (_, privateKeyWrapper) => {
- donor = privateKeyWrapper('//Alice');
+ await usingPlaygrounds(async (_, privateKey) => {
+ donor = await privateKey({filename: __filename});
});
});
@@ -44,8 +44,8 @@
let donor: IKeyringPair;
before(async () => {
- await usingPlaygrounds(async (_, privateKeyWrapper) => {
- donor = privateKeyWrapper('//Alice');
+ await usingPlaygrounds(async (_, privateKey) => {
+ donor = await privateKey({filename: __filename});
});
});
tests/src/adminTransferAndBurn.test.tsdiffbeforeafterboth--- a/tests/src/adminTransferAndBurn.test.ts
+++ b/tests/src/adminTransferAndBurn.test.ts
@@ -24,7 +24,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);
});
});
tests/src/allowLists.test.tsdiffbeforeafterboth--- a/tests/src/allowLists.test.ts
+++ b/tests/src/allowLists.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([30n, 10n, 10n], donor);
});
});
@@ -87,7 +87,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([30n, 10n, 10n], donor);
});
});
@@ -163,7 +163,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([30n, 10n, 10n], donor);
});
});
@@ -291,7 +291,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
tests/src/app-promotion.test.tsdiffbeforeafterboth--- a/tests/src/app-promotion.test.ts
+++ b/tests/src/app-promotion.test.ts
@@ -43,8 +43,8 @@
before(async function () {
await usingPlaygrounds(async (helper, privateKey) => {
if (!getModuleNames(helper.api!).includes(Pallets.AppPromotion)) this.skip();
- alice = privateKey('//Alice');
- palletAdmin = privateKey('//Charlie'); // TODO use custom address
+ alice = await privateKey({filename: __filename});
+ [palletAdmin] = await helper.arrange.createAccounts([100n], alice);
await helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));
nominal = helper.balance.getOneTokenNominal();
await helper.balance.transferToSubstrate(alice, palletAdmin.address, 1000n * nominal);
tests/src/approve.test.tsdiffbeforeafterboth--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -104,7 +104,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -141,7 +141,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -184,7 +184,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -235,7 +235,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);
});
});
@@ -265,7 +265,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -320,7 +320,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -357,7 +357,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);
});
});
@@ -423,7 +423,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);
});
});
@@ -474,7 +474,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -495,7 +495,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
tests/src/burnItem.test.tsdiffbeforeafterboth--- a/tests/src/burnItem.test.ts
+++ b/tests/src/burnItem.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
@@ -80,7 +80,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
@@ -123,7 +123,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
tests/src/change-collection-owner.test.tsdiffbeforeafterboth--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -23,7 +23,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
@@ -46,7 +46,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -108,7 +108,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
tests/src/check-event/burnItemEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/burnItemEvent.test.ts
+++ b/tests/src/check-event/burnItemEvent.test.ts
@@ -24,7 +24,7 @@
let alice: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/check-event/createCollectionEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createCollectionEvent.test.ts
+++ b/tests/src/check-event/createCollectionEvent.test.ts
@@ -23,7 +23,7 @@
let alice: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/check-event/createItemEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createItemEvent.test.ts
+++ b/tests/src/check-event/createItemEvent.test.ts
@@ -23,7 +23,7 @@
let alice: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/check-event/createMultipleItemsEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createMultipleItemsEvent.test.ts
+++ b/tests/src/check-event/createMultipleItemsEvent.test.ts
@@ -23,7 +23,7 @@
let alice: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/check-event/destroyCollectionEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/destroyCollectionEvent.test.ts
+++ b/tests/src/check-event/destroyCollectionEvent.test.ts
@@ -23,7 +23,7 @@
let alice: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/check-event/transferEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/transferEvent.test.ts
+++ b/tests/src/check-event/transferEvent.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([10n, 10n], donor);
});
});
tests/src/check-event/transferFromEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/transferFromEvent.test.ts
+++ b/tests/src/check-event/transferFromEvent.test.ts
@@ -24,7 +24,7 @@
let bob: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([10n, 10n], donor);
});
});
tests/src/confirmSponsorship.test.tsdiffbeforeafterboth--- a/tests/src/confirmSponsorship.test.ts
+++ b/tests/src/confirmSponsorship.test.ts
@@ -37,7 +37,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie, zeroBalance] = await helper.arrange.createAccounts([100n, 100n, 100n, 0n], donor);
});
});
@@ -183,7 +183,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie, ownerZeroBalance, senderZeroBalance] = await helper.arrange.createAccounts([100n, 100n, 100n, 0n, 0n], donor);
});
});
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -49,7 +49,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([100n], donor);
});
});
@@ -110,7 +110,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([100n], donor);
});
});
tests/src/createItem.test.tsdiffbeforeafterboth--- a/tests/src/createItem.test.ts
+++ b/tests/src/createItem.test.ts
@@ -50,7 +50,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
@@ -179,7 +179,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
tests/src/createMultipleItems.test.tsdiffbeforeafterboth--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -22,7 +22,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([100n], donor);
});
});
@@ -168,7 +168,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
tests/src/createMultipleItemsEx.test.tsdiffbeforeafterboth--- a/tests/src/createMultipleItemsEx.test.ts
+++ b/tests/src/createMultipleItemsEx.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -268,7 +268,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
tests/src/creditFeesToTreasury.test.tsdiffbeforeafterboth--- a/tests/src/creditFeesToTreasury.test.ts
+++ b/tests/src/creditFeesToTreasury.test.ts
@@ -50,7 +50,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
tests/src/destroyCollection.test.tsdiffbeforeafterboth--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -22,7 +22,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([100n], donor);
});
});
@@ -62,7 +62,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
tests/src/enableDisableTransfer.test.tsdiffbeforeafterboth--- a/tests/src/enableDisableTransfer.test.ts
+++ b/tests/src/enableDisableTransfer.test.ts
@@ -23,7 +23,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
@@ -62,7 +62,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);
});
});
tests/src/eth/allowlist.test.tsdiffbeforeafterboth--- a/tests/src/eth/allowlist.test.ts
+++ b/tests/src/eth/allowlist.test.ts
@@ -22,7 +22,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -70,7 +70,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -29,7 +29,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -82,7 +82,7 @@
before(async () => {
await usingEthPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
const [alice] = await helper.arrange.createAccounts([10n], donor);
({collectionId: collection} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'}));
minter = helper.eth.createAccount();
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -32,7 +32,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -144,7 +144,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -272,7 +272,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -314,7 +314,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -1,3 +1,19 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
import {itEth, usingEthPlaygrounds, expect} from './util/playgrounds';
import {IKeyringPair} from '@polkadot/types/types';
@@ -7,7 +23,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await _helper.arrange.createAccounts([10n], donor);
});
});
tests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -24,7 +24,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -150,7 +150,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -26,7 +26,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -152,7 +152,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/crossTransfer.test.tsdiffbeforeafterboth--- a/tests/src/eth/crossTransfer.test.ts
+++ b/tests/src/eth/crossTransfer.test.ts
@@ -26,7 +26,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);
});
});
@@ -69,7 +69,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);
});
});
tests/src/eth/fractionalizer/fractionalizer.test.tsdiffbeforeafterboth--- a/tests/src/eth/fractionalizer/fractionalizer.test.ts
+++ b/tests/src/eth/fractionalizer/fractionalizer.test.ts
@@ -85,7 +85,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper: EthUniqueHelper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -225,7 +225,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper: EthUniqueHelper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -23,7 +23,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([20n], donor);
});
});
@@ -55,7 +55,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([20n], donor);
});
});
@@ -224,7 +224,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([20n], donor);
});
});
@@ -277,7 +277,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([20n], donor);
});
});
tests/src/eth/helpersSmoke.test.tsdiffbeforeafterboth--- a/tests/src/eth/helpersSmoke.test.ts
+++ b/tests/src/eth/helpersSmoke.test.ts
@@ -22,7 +22,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/migration.test.tsdiffbeforeafterboth--- a/tests/src/eth/migration.test.ts
+++ b/tests/src/eth/migration.test.ts
@@ -22,7 +22,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- superuser = privateKey('//Alice');
+ superuser = await privateKey('//Alice');
});
});
tests/src/eth/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -21,7 +21,7 @@
before(async function() {
await usingEthPlaygrounds(async (_, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -25,7 +25,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -75,7 +75,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -137,7 +137,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -318,7 +318,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -371,7 +371,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([20n], donor);
});
});
@@ -496,7 +496,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([20n], donor);
});
});
tests/src/eth/payable.test.tsdiffbeforeafterboth--- a/tests/src/eth/payable.test.ts
+++ b/tests/src/eth/payable.test.ts
@@ -23,7 +23,7 @@
before(async function() {
await usingEthPlaygrounds(async (_, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -68,7 +68,7 @@
expect(await contract.methods.getUnaccounted().call()).to.be.equal(weiCount.toString());
});
- itEth('Balance can be retrieved from evm contract', async({helper, privateKey}) => {
+ itEth('Balance can be retrieved from evm contract', async({helper}) => {
const FEE_BALANCE = 10n * helper.balance.getOneTokenNominal();
const CONTRACT_BALANCE = 1n * helper.balance.getOneTokenNominal();
@@ -80,7 +80,7 @@
await web3.eth.sendTransaction({from: deployer, to: contract.options.address, value: CONTRACT_BALANCE.toString(), gas: helper.eth.DEFAULT_GAS});
- const receiver = privateKey(`//Receiver${Date.now()}`);
+ const [receiver] = await helper.arrange.createAccounts([0n], donor);
// First receive balance on eth balance of bob
{
@@ -110,7 +110,7 @@
before(async function() {
await usingEthPlaygrounds(async (_, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/eth/proxy/fungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/fungibleProxy.test.ts
+++ b/tests/src/eth/proxy/fungibleProxy.test.ts
@@ -38,7 +38,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -77,7 +77,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -38,7 +38,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -95,7 +95,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -139,7 +139,7 @@
});
//TODO: CORE-302 add eth methods
- itWeb3.skip('Can perform mintBulk()', async ({web3, api, privateKeyWrapper}) => {
+ itWeb3.skip('Can perform mintBulk()', async () => {
/*
const collection = await createCollectionExpectSuccess({
mode: {type: 'NFT'},
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -25,7 +25,7 @@
await usingEthPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -117,7 +117,7 @@
await usingEthPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -329,7 +329,7 @@
await usingEthPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
@@ -370,7 +370,7 @@
await usingEthPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([20n], donor);
});
});
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {Pallets, requirePalletsOrSkip} from '../util/playgrounds';18import {EthUniqueHelper, expect, itEth, usingEthPlaygrounds} from './util/playgrounds';19import {IKeyringPair} from '@polkadot/types/types';20import {Contract} from 'web3-eth-contract';21import {UNIQUE} from '../util/helpers';2223describe('Refungible token: Information getting', () => {24 let donor: IKeyringPair;25 let alice: IKeyringPair;2627 before(async function() {28 await usingEthPlaygrounds(async (helper, privateKey) => {29 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);3031 donor = privateKey('//Alice');32 [alice] = await helper.arrange.createAccounts([20n], donor);33 });34 });3536 itEth('totalSupply', async ({helper}) => {37 const caller = await helper.eth.createAccountWithBalance(donor);38 const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});39 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});4041 const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);42 const totalSupply = await contract.methods.totalSupply().call();43 expect(totalSupply).to.equal('200');44 });4546 itEth('balanceOf', async ({helper}) => {47 const caller = await helper.eth.createAccountWithBalance(donor);48 const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});49 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});5051 const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);52 const balance = await contract.methods.balanceOf(caller).call();53 expect(balance).to.equal('200');54 });5556 itEth('decimals', async ({helper}) => {57 const caller = await helper.eth.createAccountWithBalance(donor);58 const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});59 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});6061 const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);62 const decimals = await contract.methods.decimals().call();63 expect(decimals).to.equal('0');64 });65});6667// FIXME: Need erc721 for ReFubgible.68describe('Check ERC721 token URI for ReFungible', () => {69 let donor: IKeyringPair;7071 before(async function() {72 await usingEthPlaygrounds(async (helper, privateKey) => {73 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);7475 donor = privateKey('//Alice');76 });77 });7879 async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {80 const owner = await helper.eth.createAccountWithBalance(donor);81 const receiver = helper.eth.createAccount();8283 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);84 let result = await collectionHelper.methods.createERC721MetadataCompatibleCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * UNIQUE)});85 const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);86 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);87 88 const nextTokenId = await contract.methods.nextTokenId().call();89 expect(nextTokenId).to.be.equal('1');90 result = await contract.methods.mint(91 receiver,92 nextTokenId,93 ).send();9495 if (propertyKey && propertyValue) {96 // Set URL or suffix97 await contract.methods.setProperty(nextTokenId, propertyKey, Buffer.from(propertyValue)).send();98 }99100 const event = result.events.Transfer;101 expect(event.address).to.be.equal(collectionAddress);102 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');103 expect(event.returnValues.to).to.be.equal(receiver);104 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);105106 return {contract, nextTokenId};107 }108109 itEth('Empty tokenURI', async ({helper}) => {110 const {contract, nextTokenId} = await setup(helper, '');111 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');112 });113114 itEth('TokenURI from url', async ({helper}) => {115 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');116 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');117 });118119 itEth('TokenURI from baseURI + tokenId', async ({helper}) => {120 const {contract, nextTokenId} = await setup(helper, 'BaseURI_');121 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);122 });123124 itEth('TokenURI from baseURI + suffix', async ({helper}) => {125 const suffix = '/some/suffix';126 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);127 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);128 });129});130131describe('Refungible: Plain calls', () => {132 let donor: IKeyringPair;133 let alice: IKeyringPair;134135 before(async function() {136 await usingEthPlaygrounds(async (helper, privateKey) => {137 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);138139 donor = privateKey('//Alice');140 [alice] = await helper.arrange.createAccounts([50n], donor);141 });142 });143144 itEth('Can perform approve()', async ({helper}) => {145 const owner = await helper.eth.createAccountWithBalance(donor);146 const spender = helper.eth.createAccount();147 const collection = await helper.rft.mintCollection(alice);148 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});149150 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);151 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);152153 {154 const result = await contract.methods.approve(spender, 100).send({from: owner});155 const event = result.events.Approval;156 expect(event.address).to.be.equal(tokenAddress);157 expect(event.returnValues.owner).to.be.equal(owner);158 expect(event.returnValues.spender).to.be.equal(spender);159 expect(event.returnValues.value).to.be.equal('100');160 }161162 {163 const allowance = await contract.methods.allowance(owner, spender).call();164 expect(+allowance).to.equal(100);165 }166 });167168 itEth('Can perform transferFrom()', async ({helper}) => {169 const owner = await helper.eth.createAccountWithBalance(donor);170 const spender = await helper.eth.createAccountWithBalance(donor);171 const receiver = helper.eth.createAccount();172 const collection = await helper.rft.mintCollection(alice);173 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});174175 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);176 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);177178 await contract.methods.approve(spender, 100).send();179180 {181 const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});182 let event = result.events.Transfer;183 expect(event.address).to.be.equal(tokenAddress);184 expect(event.returnValues.from).to.be.equal(owner);185 expect(event.returnValues.to).to.be.equal(receiver);186 expect(event.returnValues.value).to.be.equal('49');187188 event = result.events.Approval;189 expect(event.address).to.be.equal(tokenAddress);190 expect(event.returnValues.owner).to.be.equal(owner);191 expect(event.returnValues.spender).to.be.equal(spender);192 expect(event.returnValues.value).to.be.equal('51');193 }194195 {196 const balance = await contract.methods.balanceOf(receiver).call();197 expect(+balance).to.equal(49);198 }199200 {201 const balance = await contract.methods.balanceOf(owner).call();202 expect(+balance).to.equal(151);203 }204 });205206 itEth('Can perform transfer()', async ({helper}) => {207 const owner = await helper.eth.createAccountWithBalance(donor);208 const receiver = helper.eth.createAccount();209 const collection = await helper.rft.mintCollection(alice);210 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});211212 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);213 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);214215 {216 const result = await contract.methods.transfer(receiver, 50).send({from: owner});217 const event = result.events.Transfer;218 expect(event.address).to.be.equal(tokenAddress);219 expect(event.returnValues.from).to.be.equal(owner);220 expect(event.returnValues.to).to.be.equal(receiver);221 expect(event.returnValues.value).to.be.equal('50');222 }223224 {225 const balance = await contract.methods.balanceOf(owner).call();226 expect(+balance).to.equal(150);227 }228229 {230 const balance = await contract.methods.balanceOf(receiver).call();231 expect(+balance).to.equal(50);232 }233 });234235 itEth('Can perform repartition()', async ({helper}) => {236 const owner = await helper.eth.createAccountWithBalance(donor);237 const receiver = await helper.eth.createAccountWithBalance(donor);238 const collection = await helper.rft.mintCollection(alice);239 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});240241 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);242 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);243244 await contract.methods.repartition(200).send({from: owner});245 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(200);246 await contract.methods.transfer(receiver, 110).send({from: owner});247 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(90);248 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(110);249250 await expect(contract.methods.repartition(80).send({from: owner})).to.eventually.be.rejected; // Transaction is reverted251252 await contract.methods.transfer(receiver, 90).send({from: owner});253 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(0);254 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(200);255256 await contract.methods.repartition(150).send({from: receiver});257 await expect(contract.methods.transfer(owner, 160).send({from: receiver})).to.eventually.be.rejected; // Transaction is reverted258 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(150);259 });260261 itEth('Can repartition with increased amount', async ({helper}) => {262 const owner = await helper.eth.createAccountWithBalance(donor);263 const collection = await helper.rft.mintCollection(alice);264 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});265266 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);267 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);268269 const result = await contract.methods.repartition(200).send();270271 const event = result.events.Transfer;272 expect(event.address).to.be.equal(tokenAddress);273 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');274 expect(event.returnValues.to).to.be.equal(owner);275 expect(event.returnValues.value).to.be.equal('100');276 });277278 itEth('Can repartition with decreased amount', async ({helper}) => {279 const owner = await helper.eth.createAccountWithBalance(donor);280 const collection = await helper.rft.mintCollection(alice);281 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});282283 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);284 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);285286 const result = await contract.methods.repartition(50).send();287 const event = result.events.Transfer;288 expect(event.address).to.be.equal(tokenAddress);289 expect(event.returnValues.from).to.be.equal(owner);290 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');291 expect(event.returnValues.value).to.be.equal('50');292 });293294 itEth('Receiving Transfer event on burning into full ownership', async ({helper}) => {295 const caller = await helper.eth.createAccountWithBalance(donor);296 const receiver = await helper.eth.createAccountWithBalance(donor);297 const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Devastation', '6', '6');298 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);299300 const tokenId = await contract.methods.nextTokenId().call();301 await contract.methods.mint(caller, tokenId).send();302 const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);303 const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, caller);304305 await tokenContract.methods.repartition(2).send();306 await tokenContract.methods.transfer(receiver, 1).send();307308 const events: any = [];309 contract.events.allEvents((_: any, event: any) => {310 events.push(event);311 });312 await tokenContract.methods.burnFrom(caller, 1).send();313314 const event = events[0];315 expect(event.address).to.be.equal(collectionAddress);316 expect(event.returnValues.from).to.be.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');317 expect(event.returnValues.to).to.be.equal(receiver);318 expect(event.returnValues.tokenId).to.be.equal(tokenId);319 });320});321322describe('Refungible: Fees', () => {323 let donor: IKeyringPair;324 let alice: IKeyringPair;325326 before(async function() {327 await usingEthPlaygrounds(async (helper, privateKey) => {328 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);329330 donor = privateKey('//Alice');331 [alice] = await helper.arrange.createAccounts([50n], donor);332 });333 });334335 itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {336 const owner = await helper.eth.createAccountWithBalance(donor);337 const spender = helper.eth.createAccount();338 const collection = await helper.rft.mintCollection(alice);339 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});340341 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);342 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);343344 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, 100).send({from: owner}));345 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));346 });347348 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {349 const owner = await helper.eth.createAccountWithBalance(donor);350 const spender = await helper.eth.createAccountWithBalance(donor);351 const collection = await helper.rft.mintCollection(alice);352 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});353354 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);355 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);356357 await contract.methods.approve(spender, 100).send({from: owner});358359 const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));360 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));361 });362363 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {364 const owner = await helper.eth.createAccountWithBalance(donor);365 const receiver = helper.eth.createAccount();366 const collection = await helper.rft.mintCollection(alice);367 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});368369 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);370 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);371372 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));373 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));374 });375});376377describe('Refungible: Substrate calls', () => {378 let donor: IKeyringPair;379 let alice: IKeyringPair;380381 before(async function() {382 await usingEthPlaygrounds(async (helper, privateKey) => {383 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);384385 donor = privateKey('//Alice');386 [alice] = await helper.arrange.createAccounts([50n], donor);387 });388 });389390 itEth('Events emitted for approve()', async ({helper}) => {391 const receiver = helper.eth.createAccount();392 const collection = await helper.rft.mintCollection(alice);393 const token = await collection.mintToken(alice, 200n);394395 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);396 const contract = helper.ethNativeContract.rftToken(tokenAddress);397398 const events: any = [];399 contract.events.allEvents((_: any, event: any) => {400 events.push(event);401 });402 expect(await token.approve(alice, {Ethereum: receiver}, 100n)).to.be.true;403404 const event = events[0];405 expect(event.event).to.be.equal('Approval');406 expect(event.address).to.be.equal(tokenAddress);407 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));408 expect(event.returnValues.spender).to.be.equal(receiver);409 expect(event.returnValues.value).to.be.equal('100');410 });411412 itEth('Events emitted for transferFrom()', async ({helper}) => {413 const [bob] = await helper.arrange.createAccounts([10n], donor);414 const receiver = helper.eth.createAccount();415 const collection = await helper.rft.mintCollection(alice);416 const token = await collection.mintToken(alice, 200n);417 await token.approve(alice, {Substrate: bob.address}, 100n);418419 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);420 const contract = helper.ethNativeContract.rftToken(tokenAddress);421422 const events: any = [];423 contract.events.allEvents((_: any, event: any) => {424 events.push(event);425 });426427 expect(await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n)).to.be.true;428429 let event = events[0];430 expect(event.event).to.be.equal('Transfer');431 expect(event.address).to.be.equal(tokenAddress);432 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));433 expect(event.returnValues.to).to.be.equal(receiver);434 expect(event.returnValues.value).to.be.equal('51');435436 event = events[1];437 expect(event.event).to.be.equal('Approval');438 expect(event.address).to.be.equal(tokenAddress);439 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));440 expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(bob.address));441 expect(event.returnValues.value).to.be.equal('49');442 });443444 itEth('Events emitted for transfer()', async ({helper}) => {445 const receiver = helper.eth.createAccount();446 const collection = await helper.rft.mintCollection(alice);447 const token = await collection.mintToken(alice, 200n);448449 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);450 const contract = helper.ethNativeContract.rftToken(tokenAddress);451452 const events: any = [];453 contract.events.allEvents((_: any, event: any) => {454 events.push(event);455 });456457 expect(await token.transfer(alice, {Ethereum: receiver}, 51n)).to.be.true;458459 const event = events[0];460 expect(event.event).to.be.equal('Transfer');461 expect(event.address).to.be.equal(tokenAddress);462 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));463 expect(event.returnValues.to).to.be.equal(receiver);464 expect(event.returnValues.value).to.be.equal('51');465 });466});467468describe('ERC 1633 implementation', () => {469 let donor: IKeyringPair;470471 before(async function() {472 await usingEthPlaygrounds(async (helper, privateKey) => {473 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);474475 donor = privateKey('//Alice');476 });477 });478479 itEth('Default parent token address and id', async ({helper}) => {480 const owner = await helper.eth.createAccountWithBalance(donor);481482 const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Sands', '', 'GRAIN');483 const collectionContract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);484 485 const tokenId = await collectionContract.methods.nextTokenId().call();486 await collectionContract.methods.mint(owner, tokenId).send();487 const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);488 const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, owner);489490 expect(await tokenContract.methods.parentToken().call()).to.be.equal(collectionAddress);491 expect(await tokenContract.methods.parentTokenId().call()).to.be.equal(tokenId);492 });493});1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {Pallets, requirePalletsOrSkip} from '../util/playgrounds';18import {EthUniqueHelper, expect, itEth, usingEthPlaygrounds} from './util/playgrounds';19import {IKeyringPair} from '@polkadot/types/types';20import {Contract} from 'web3-eth-contract';21import {UNIQUE} from '../util/helpers';2223describe('Refungible token: Information getting', () => {24 let donor: IKeyringPair;25 let alice: IKeyringPair;2627 before(async function() {28 await usingEthPlaygrounds(async (helper, privateKey) => {29 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);3031 donor = await privateKey({filename: __filename});32 [alice] = await helper.arrange.createAccounts([20n], donor);33 });34 });3536 itEth('totalSupply', async ({helper}) => {37 const caller = await helper.eth.createAccountWithBalance(donor);38 const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});39 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});4041 const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);42 const totalSupply = await contract.methods.totalSupply().call();43 expect(totalSupply).to.equal('200');44 });4546 itEth('balanceOf', async ({helper}) => {47 const caller = await helper.eth.createAccountWithBalance(donor);48 const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});49 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});5051 const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);52 const balance = await contract.methods.balanceOf(caller).call();53 expect(balance).to.equal('200');54 });5556 itEth('decimals', async ({helper}) => {57 const caller = await helper.eth.createAccountWithBalance(donor);58 const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});59 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});6061 const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);62 const decimals = await contract.methods.decimals().call();63 expect(decimals).to.equal('0');64 });65});6667// FIXME: Need erc721 for ReFubgible.68describe('Check ERC721 token URI for ReFungible', () => {69 let donor: IKeyringPair;7071 before(async function() {72 await usingEthPlaygrounds(async (helper, privateKey) => {73 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);7475 donor = await privateKey({filename: __filename});76 });77 });7879 async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {80 const owner = await helper.eth.createAccountWithBalance(donor);81 const receiver = helper.eth.createAccount();8283 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);84 let result = await collectionHelper.methods.createERC721MetadataCompatibleCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * UNIQUE)});85 const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);86 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);87 88 const nextTokenId = await contract.methods.nextTokenId().call();89 expect(nextTokenId).to.be.equal('1');90 result = await contract.methods.mint(91 receiver,92 nextTokenId,93 ).send();9495 if (propertyKey && propertyValue) {96 // Set URL or suffix97 await contract.methods.setProperty(nextTokenId, propertyKey, Buffer.from(propertyValue)).send();98 }99100 const event = result.events.Transfer;101 expect(event.address).to.be.equal(collectionAddress);102 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');103 expect(event.returnValues.to).to.be.equal(receiver);104 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);105106 return {contract, nextTokenId};107 }108109 itEth('Empty tokenURI', async ({helper}) => {110 const {contract, nextTokenId} = await setup(helper, '');111 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');112 });113114 itEth('TokenURI from url', async ({helper}) => {115 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');116 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');117 });118119 itEth('TokenURI from baseURI + tokenId', async ({helper}) => {120 const {contract, nextTokenId} = await setup(helper, 'BaseURI_');121 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);122 });123124 itEth('TokenURI from baseURI + suffix', async ({helper}) => {125 const suffix = '/some/suffix';126 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);127 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);128 });129});130131describe('Refungible: Plain calls', () => {132 let donor: IKeyringPair;133 let alice: IKeyringPair;134135 before(async function() {136 await usingEthPlaygrounds(async (helper, privateKey) => {137 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);138139 donor = await privateKey({filename: __filename});140 [alice] = await helper.arrange.createAccounts([50n], donor);141 });142 });143144 itEth('Can perform approve()', async ({helper}) => {145 const owner = await helper.eth.createAccountWithBalance(donor);146 const spender = helper.eth.createAccount();147 const collection = await helper.rft.mintCollection(alice);148 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});149150 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);151 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);152153 {154 const result = await contract.methods.approve(spender, 100).send({from: owner});155 const event = result.events.Approval;156 expect(event.address).to.be.equal(tokenAddress);157 expect(event.returnValues.owner).to.be.equal(owner);158 expect(event.returnValues.spender).to.be.equal(spender);159 expect(event.returnValues.value).to.be.equal('100');160 }161162 {163 const allowance = await contract.methods.allowance(owner, spender).call();164 expect(+allowance).to.equal(100);165 }166 });167168 itEth('Can perform transferFrom()', async ({helper}) => {169 const owner = await helper.eth.createAccountWithBalance(donor);170 const spender = await helper.eth.createAccountWithBalance(donor);171 const receiver = helper.eth.createAccount();172 const collection = await helper.rft.mintCollection(alice);173 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});174175 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);176 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);177178 await contract.methods.approve(spender, 100).send();179180 {181 const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});182 let event = result.events.Transfer;183 expect(event.address).to.be.equal(tokenAddress);184 expect(event.returnValues.from).to.be.equal(owner);185 expect(event.returnValues.to).to.be.equal(receiver);186 expect(event.returnValues.value).to.be.equal('49');187188 event = result.events.Approval;189 expect(event.address).to.be.equal(tokenAddress);190 expect(event.returnValues.owner).to.be.equal(owner);191 expect(event.returnValues.spender).to.be.equal(spender);192 expect(event.returnValues.value).to.be.equal('51');193 }194195 {196 const balance = await contract.methods.balanceOf(receiver).call();197 expect(+balance).to.equal(49);198 }199200 {201 const balance = await contract.methods.balanceOf(owner).call();202 expect(+balance).to.equal(151);203 }204 });205206 itEth('Can perform transfer()', async ({helper}) => {207 const owner = await helper.eth.createAccountWithBalance(donor);208 const receiver = helper.eth.createAccount();209 const collection = await helper.rft.mintCollection(alice);210 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});211212 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);213 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);214215 {216 const result = await contract.methods.transfer(receiver, 50).send({from: owner});217 const event = result.events.Transfer;218 expect(event.address).to.be.equal(tokenAddress);219 expect(event.returnValues.from).to.be.equal(owner);220 expect(event.returnValues.to).to.be.equal(receiver);221 expect(event.returnValues.value).to.be.equal('50');222 }223224 {225 const balance = await contract.methods.balanceOf(owner).call();226 expect(+balance).to.equal(150);227 }228229 {230 const balance = await contract.methods.balanceOf(receiver).call();231 expect(+balance).to.equal(50);232 }233 });234235 itEth('Can perform repartition()', async ({helper}) => {236 const owner = await helper.eth.createAccountWithBalance(donor);237 const receiver = await helper.eth.createAccountWithBalance(donor);238 const collection = await helper.rft.mintCollection(alice);239 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});240241 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);242 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);243244 await contract.methods.repartition(200).send({from: owner});245 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(200);246 await contract.methods.transfer(receiver, 110).send({from: owner});247 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(90);248 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(110);249250 await expect(contract.methods.repartition(80).send({from: owner})).to.eventually.be.rejected; // Transaction is reverted251252 await contract.methods.transfer(receiver, 90).send({from: owner});253 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(0);254 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(200);255256 await contract.methods.repartition(150).send({from: receiver});257 await expect(contract.methods.transfer(owner, 160).send({from: receiver})).to.eventually.be.rejected; // Transaction is reverted258 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(150);259 });260261 itEth('Can repartition with increased amount', async ({helper}) => {262 const owner = await helper.eth.createAccountWithBalance(donor);263 const collection = await helper.rft.mintCollection(alice);264 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});265266 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);267 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);268269 const result = await contract.methods.repartition(200).send();270271 const event = result.events.Transfer;272 expect(event.address).to.be.equal(tokenAddress);273 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');274 expect(event.returnValues.to).to.be.equal(owner);275 expect(event.returnValues.value).to.be.equal('100');276 });277278 itEth('Can repartition with decreased amount', async ({helper}) => {279 const owner = await helper.eth.createAccountWithBalance(donor);280 const collection = await helper.rft.mintCollection(alice);281 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});282283 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);284 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);285286 const result = await contract.methods.repartition(50).send();287 const event = result.events.Transfer;288 expect(event.address).to.be.equal(tokenAddress);289 expect(event.returnValues.from).to.be.equal(owner);290 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');291 expect(event.returnValues.value).to.be.equal('50');292 });293294 itEth('Receiving Transfer event on burning into full ownership', async ({helper}) => {295 const caller = await helper.eth.createAccountWithBalance(donor);296 const receiver = await helper.eth.createAccountWithBalance(donor);297 const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Devastation', '6', '6');298 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);299300 const tokenId = await contract.methods.nextTokenId().call();301 await contract.methods.mint(caller, tokenId).send();302 const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);303 const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, caller);304305 await tokenContract.methods.repartition(2).send();306 await tokenContract.methods.transfer(receiver, 1).send();307308 const events: any = [];309 contract.events.allEvents((_: any, event: any) => {310 events.push(event);311 });312 await tokenContract.methods.burnFrom(caller, 1).send();313314 const event = events[0];315 expect(event.address).to.be.equal(collectionAddress);316 expect(event.returnValues.from).to.be.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');317 expect(event.returnValues.to).to.be.equal(receiver);318 expect(event.returnValues.tokenId).to.be.equal(tokenId);319 });320});321322describe('Refungible: Fees', () => {323 let donor: IKeyringPair;324 let alice: IKeyringPair;325326 before(async function() {327 await usingEthPlaygrounds(async (helper, privateKey) => {328 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);329330 donor = await privateKey({filename: __filename});331 [alice] = await helper.arrange.createAccounts([50n], donor);332 });333 });334335 itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {336 const owner = await helper.eth.createAccountWithBalance(donor);337 const spender = helper.eth.createAccount();338 const collection = await helper.rft.mintCollection(alice);339 const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});340341 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);342 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);343344 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, 100).send({from: owner}));345 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));346 });347348 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {349 const owner = await helper.eth.createAccountWithBalance(donor);350 const spender = await helper.eth.createAccountWithBalance(donor);351 const collection = await helper.rft.mintCollection(alice);352 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});353354 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);355 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);356357 await contract.methods.approve(spender, 100).send({from: owner});358359 const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));360 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));361 });362363 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {364 const owner = await helper.eth.createAccountWithBalance(donor);365 const receiver = helper.eth.createAccount();366 const collection = await helper.rft.mintCollection(alice);367 const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});368369 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);370 const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);371372 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));373 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));374 });375});376377describe('Refungible: Substrate calls', () => {378 let donor: IKeyringPair;379 let alice: IKeyringPair;380381 before(async function() {382 await usingEthPlaygrounds(async (helper, privateKey) => {383 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);384385 donor = await privateKey({filename: __filename});386 [alice] = await helper.arrange.createAccounts([50n], donor);387 });388 });389390 itEth('Events emitted for approve()', async ({helper}) => {391 const receiver = helper.eth.createAccount();392 const collection = await helper.rft.mintCollection(alice);393 const token = await collection.mintToken(alice, 200n);394395 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);396 const contract = helper.ethNativeContract.rftToken(tokenAddress);397398 const events: any = [];399 contract.events.allEvents((_: any, event: any) => {400 events.push(event);401 });402 expect(await token.approve(alice, {Ethereum: receiver}, 100n)).to.be.true;403404 const event = events[0];405 expect(event.event).to.be.equal('Approval');406 expect(event.address).to.be.equal(tokenAddress);407 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));408 expect(event.returnValues.spender).to.be.equal(receiver);409 expect(event.returnValues.value).to.be.equal('100');410 });411412 itEth('Events emitted for transferFrom()', async ({helper}) => {413 const [bob] = await helper.arrange.createAccounts([10n], donor);414 const receiver = helper.eth.createAccount();415 const collection = await helper.rft.mintCollection(alice);416 const token = await collection.mintToken(alice, 200n);417 await token.approve(alice, {Substrate: bob.address}, 100n);418419 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);420 const contract = helper.ethNativeContract.rftToken(tokenAddress);421422 const events: any = [];423 contract.events.allEvents((_: any, event: any) => {424 events.push(event);425 });426427 expect(await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n)).to.be.true;428429 let event = events[0];430 expect(event.event).to.be.equal('Transfer');431 expect(event.address).to.be.equal(tokenAddress);432 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));433 expect(event.returnValues.to).to.be.equal(receiver);434 expect(event.returnValues.value).to.be.equal('51');435436 event = events[1];437 expect(event.event).to.be.equal('Approval');438 expect(event.address).to.be.equal(tokenAddress);439 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));440 expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(bob.address));441 expect(event.returnValues.value).to.be.equal('49');442 });443444 itEth('Events emitted for transfer()', async ({helper}) => {445 const receiver = helper.eth.createAccount();446 const collection = await helper.rft.mintCollection(alice);447 const token = await collection.mintToken(alice, 200n);448449 const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);450 const contract = helper.ethNativeContract.rftToken(tokenAddress);451452 const events: any = [];453 contract.events.allEvents((_: any, event: any) => {454 events.push(event);455 });456457 expect(await token.transfer(alice, {Ethereum: receiver}, 51n)).to.be.true;458459 const event = events[0];460 expect(event.event).to.be.equal('Transfer');461 expect(event.address).to.be.equal(tokenAddress);462 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));463 expect(event.returnValues.to).to.be.equal(receiver);464 expect(event.returnValues.value).to.be.equal('51');465 });466});467468describe('ERC 1633 implementation', () => {469 let donor: IKeyringPair;470471 before(async function() {472 await usingEthPlaygrounds(async (helper, privateKey) => {473 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);474475 donor = await privateKey({filename: __filename});476 });477 });478479 itEth('Default parent token address and id', async ({helper}) => {480 const owner = await helper.eth.createAccountWithBalance(donor);481482 const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Sands', '', 'GRAIN');483 const collectionContract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);484 485 const tokenId = await collectionContract.methods.nextTokenId().call();486 await collectionContract.methods.mint(owner, tokenId).send();487 const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);488 const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, owner);489490 expect(await tokenContract.methods.parentToken().call()).to.be.equal(collectionAddress);491 expect(await tokenContract.methods.parentTokenId().call()).to.be.equal(tokenId);492 });493});tests/src/eth/tokenProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -1,94 +1,116 @@
-import {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess} from '../util/helpers';
-import {cartesian, collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3} from './util/helpers';
-import nonFungibleAbi from './nonFungibleAbi.json';
-import {expect} from 'chai';
-import {executeTransaction} from '../substrate/substrate-api';
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+import {itEth, usingEthPlaygrounds, expect, cartesian} from './util/playgrounds';
+import {IKeyringPair} from '@polkadot/types/types';
describe('EVM token properties', () => {
- itWeb3('Can be reconfigured', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper('//Alice');
- const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ let donor: IKeyringPair;
+ let alice: IKeyringPair;
+
+ before(async function() {
+ await usingEthPlaygrounds(async (helper, privateKey) => {
+ donor = await privateKey({filename: __filename});
+ [alice] = await helper.arrange.createAccounts([100n], donor);
+ });
+ });
+
+ itEth('Can be reconfigured', async({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {
- const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
- await addCollectionAdminExpectSuccess(alice, collection, {Ethereum: caller});
+ const collection = await helper.nft.mintCollection(alice);
+ await collection.addAdmin(alice, {Ethereum: caller});
- const address = collectionIdToAddress(collection);
- const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});
+ const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(address, 'nft', caller);
await contract.methods.setTokenPropertyPermission('testKey', mutable, collectionAdmin, tokenOwner).send({from: caller});
- const state = (await api.query.common.collectionPropertyPermissions(collection)).toJSON();
- expect(state).to.be.deep.equal({
- [web3.utils.toHex('testKey')]: {mutable, collectionAdmin, tokenOwner},
- });
+ expect(await collection.getPropertyPermissions()).to.be.deep.equal([{
+ key: 'testKey',
+ permission: {mutable, collectionAdmin, tokenOwner},
+ }]);
}
});
- itWeb3('Can be set', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper('//Alice');
- const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
- const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
- const token = await createItemExpectSuccess(alice, collection, 'NFT');
- await executeTransaction(api, alice, api.tx.unique.setTokenPropertyPermissions(collection, [{
+ itEth('Can be set', async({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.nft.mintCollection(alice);
+ const token = await collection.mintToken(alice);
+
+ await collection.setTokenPropertyPermissions(alice, [{
key: 'testKey',
permission: {
collectionAdmin: true,
},
- }]));
+ }]);
- await addCollectionAdminExpectSuccess(alice, collection, {Ethereum: caller});
+ await collection.addAdmin(alice, {Ethereum: caller});
- const address = collectionIdToAddress(collection);
- const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});
+ const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(address, 'nft', caller);
- await contract.methods.setProperty(token, 'testKey', Buffer.from('testValue')).send({from: caller});
+ await contract.methods.setProperty(token.tokenId, 'testKey', Buffer.from('testValue')).send({from: caller});
- const [{value}] = (await api.rpc.unique.tokenProperties(collection, token, ['testKey'])).toHuman()! as any;
+ const [{value}] = await token.getProperties(['testKey']);
expect(value).to.equal('testValue');
});
- itWeb3('Can be deleted', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper('//Alice');
- const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
- const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
- const token = await createItemExpectSuccess(alice, collection, 'NFT');
- await executeTransaction(api, alice, api.tx.unique.setTokenPropertyPermissions(collection, [{
+ itEth('Can be deleted', async({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.nft.mintCollection(alice);
+ const token = await collection.mintToken(alice);
+
+ await collection.setTokenPropertyPermissions(alice, [{
key: 'testKey',
permission: {
mutable: true,
collectionAdmin: true,
},
- }]));
- await executeTransaction(api, alice, api.tx.unique.setTokenProperties(collection, token, [{key: 'testKey', value: 'testValue'}]));
+ }]);
+ await token.setProperties(alice, [{key: 'testKey', value: 'testValue'}]);
- await addCollectionAdminExpectSuccess(alice, collection, {Ethereum: caller});
+ await collection.addAdmin(alice, {Ethereum: caller});
- const address = collectionIdToAddress(collection);
- const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});
+ const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(address, 'nft', caller);
- await contract.methods.deleteProperty(token, 'testKey').send({from: caller});
+ await contract.methods.deleteProperty(token.tokenId, 'testKey').send({from: caller});
- const result = (await api.rpc.unique.tokenProperties(collection, token, ['testKey'])).toJSON()! as any;
+ const result = await token.getProperties(['testKey']);
expect(result.length).to.equal(0);
});
- itWeb3('Can be read', async({web3, api, privateKeyWrapper}) => {
- const alice = privateKeyWrapper('//Alice');
- const caller = createEthAccount(web3);
- const collection = await createCollectionExpectSuccess({mode: {type:'NFT'}});
- const token = await createItemExpectSuccess(alice, collection, 'NFT');
- await executeTransaction(api, alice, api.tx.unique.setTokenPropertyPermissions(collection, [{
+ itEth('Can be read', async({helper}) => {
+ const caller = helper.eth.createAccount();
+ const collection = await helper.nft.mintCollection(alice);
+ const token = await collection.mintToken(alice);
+
+ await collection.setTokenPropertyPermissions(alice, [{
key: 'testKey',
permission: {
collectionAdmin: true,
},
- }]));
- await executeTransaction(api, alice, api.tx.unique.setTokenProperties(collection, token, [{key: 'testKey', value: 'testValue'}]));
+ }]);
+ await token.setProperties(alice, [{key: 'testKey', value: 'testValue'}]);
- const address = collectionIdToAddress(collection);
- const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});
+ const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(address, 'nft', caller);
- const value = await contract.methods.property(token, 'testKey').call();
- expect(value).to.equal(web3.utils.toHex('testValue'));
+ const value = await contract.methods.property(token.tokenId, 'testKey').call();
+ expect(value).to.equal(helper.getWeb3().utils.toHex('testValue'));
});
});
tests/src/eth/util/playgrounds/index.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/index.ts
+++ b/tests/src/eth/util/playgrounds/index.ts
@@ -1,6 +1,7 @@
// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
// SPDX-License-Identifier: Apache-2.0
+import * as path from 'path';
import {IKeyringPair} from '@polkadot/types/types';
import config from '../../../config';
@@ -13,12 +14,13 @@
import chai from 'chai';
import chaiAsPromised from 'chai-as-promised';
import chaiLike from 'chai-like';
-import {requirePalletsOrSkip} from '../../../util/playgrounds';
+import {getTestSeed, requirePalletsOrSkip} from '../../../util/playgrounds';
+
chai.use(chaiAsPromised);
chai.use(chaiLike);
export const expect = chai.expect;
-export const usingEthPlaygrounds = async (code: (helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair) => Promise<void>) => {
+export const usingEthPlaygrounds = async (code: (helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair>) => Promise<void>) => {
const silentConsole = new SilentConsole();
silentConsole.enable();
@@ -28,7 +30,20 @@
await helper.connect(config.substrateUrl);
await helper.connectWeb3(config.substrateUrl);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const privateKey = (seed: string) => helper.util.fromSeed(seed, ss58Format);
+ const privateKey = async (seed: string | {filename: string}) => {
+ if (typeof seed === 'string') {
+ return helper.util.fromSeed(seed, ss58Format);
+ }
+ else {
+ const actualSeed = getTestSeed(seed.filename);
+ let account = helper.util.fromSeed(actualSeed, ss58Format);
+ if (await helper.balance.getSubstrate(account.address) == 0n) {
+ console.warn(`${path.basename(seed.filename)}: Not enough funds present on the filename account. Using the default one as the donor instead.`);
+ account = helper.util.fromSeed('//Alice', ss58Format);
+ }
+ return account;
+ }
+ };
await code(helper, privateKey);
}
finally {
@@ -38,7 +53,7 @@
}
};
-export async function itEth(name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export async function itEth(name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
(opts.only ? it.only :
opts.skip ? it.skip : it)(name, async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
@@ -51,13 +66,25 @@
});
}
-export async function itEthIfWithPallet(name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export async function itEthIfWithPallet(name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
return itEth(name, cb, {requiredPallets: required, ...opts});
}
-itEth.only = (name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itEth(name, cb, {only: true});
-itEth.skip = (name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itEth(name, cb, {skip: true});
+itEth.only = (name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any) => itEth(name, cb, {only: true});
+itEth.skip = (name: string, cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any) => itEth(name, cb, {skip: true});
-itEthIfWithPallet.only = (name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itEthIfWithPallet(name, required, cb, {only: true});
-itEthIfWithPallet.skip = (name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itEthIfWithPallet(name, required, cb, {skip: true});
+itEthIfWithPallet.only = (name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any) => itEthIfWithPallet(name, required, cb, {only: true});
+itEthIfWithPallet.skip = (name: string, required: string[], cb: (apis: { helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair> }) => any) => itEthIfWithPallet(name, required, cb, {skip: true});
itEth.ifWithPallets = itEthIfWithPallet;
+
+type ElementOf<A> = A extends readonly (infer T)[] ? T : never;
+// I want a fancier api, not a memory efficiency
+export function* cartesian<T extends Array<Array<any>>, R extends Array<any>>(internalRest: [...R], ...args: [...T]): Generator<[...R, ...{[K in keyof T]: ElementOf<T[K]>}]> {
+ if(args.length === 0) {
+ yield internalRest as any;
+ return;
+ }
+ for(const value of args[0]) {
+ yield* cartesian([...internalRest, value], ...args.slice(1)) as any;
+ }
+}
tests/src/evmCoder.test.tsdiffbeforeafterboth--- a/tests/src/evmCoder.test.ts
+++ b/tests/src/evmCoder.test.ts
@@ -92,7 +92,7 @@
before(async function() {
await usingEthPlaygrounds(async (_helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/fungible.test.tsdiffbeforeafterboth--- a/tests/src/fungible.test.ts
+++ b/tests/src/fungible.test.ts
@@ -20,12 +20,13 @@
const U128_MAX = (1n << 128n) - 1n;
describe('integration test: Fungible functionality:', () => {
+ let donor: IKeyringPair;
let alice: IKeyringPair;
let bob: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);
});
});
@@ -43,9 +44,9 @@
expect(aliceBalance).to.be.equal(U128_MAX);
});
- itSub('RPC method tokenOnewrs for fungible collection and token', async ({helper, privateKey}) => {
+ itSub('RPC method tokenOnewrs for fungible collection and token', async ({helper}) => {
const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
- const facelessCrowd = Array(7).fill(0).map((_, i) => ({Substrate: privateKey(`//Alice+${i}`).address}));
+ const facelessCrowd = (await helper.arrange.createAccounts(Array(7).fill(0n), donor)).map(keyring => {return {Substrate: keyring.address};});
const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
@@ -64,7 +65,7 @@
expect(owners).to.deep.include.members([{Substrate: alice.address}, ethAcc, {Substrate: bob.address}, ...facelessCrowd]);
expect(owners.length).to.be.equal(10);
- const eleven = privateKey('//ALice+11');
+ const [eleven] = await helper.arrange.createAccounts([0n], donor);
expect(await collection.transfer(alice, {Substrate: eleven.address}, 10n)).to.be.true;
expect((await collection.getTop10Owners()).length).to.be.equal(10);
});
tests/src/getPropertiesRpc.test.tsdiffbeforeafterboth--- a/tests/src/getPropertiesRpc.test.ts
+++ b/tests/src/getPropertiesRpc.test.ts
@@ -63,7 +63,7 @@
before(async () => {
await usingPlaygrounds(async (_, privateKey) => {
- alice = privateKey('//Alice');
+ alice = await privateKey({filename: __filename});
});
});
tests/src/inflation.test.tsdiffbeforeafterboth--- a/tests/src/inflation.test.ts
+++ b/tests/src/inflation.test.ts
@@ -23,7 +23,7 @@
before(async () => {
await usingPlaygrounds(async (_, privateKey) => {
- superuser = privateKey('//Alice');
+ superuser = await privateKey('//Alice');
});
});
tests/src/limits.test.tsdiffbeforeafterboth--- a/tests/src/limits.test.ts
+++ b/tests/src/limits.test.ts
@@ -22,7 +22,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -60,7 +60,7 @@
await usingPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
@@ -292,7 +292,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);
});
});
@@ -333,7 +333,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);
});
});
@@ -366,7 +366,7 @@
await usingPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);
});
});
@@ -404,7 +404,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/nesting/graphs.test.tsdiffbeforeafterboth--- a/tests/src/nesting/graphs.test.ts
+++ b/tests/src/nesting/graphs.test.ts
@@ -45,7 +45,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([10n], donor);
});
});
tests/src/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/nesting/nest.test.ts
+++ b/tests/src/nesting/nest.test.ts
@@ -23,7 +23,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);
});
});
@@ -137,7 +137,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([50n, 10n, 10n], donor);
});
});
@@ -343,7 +343,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 50n], donor);
});
});
tests/src/nesting/properties.test.tsdiffbeforeafterboth--- a/tests/src/nesting/properties.test.ts
+++ b/tests/src/nesting/properties.test.ts
@@ -26,7 +26,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);
});
});
@@ -141,7 +141,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);
});
});
@@ -269,7 +269,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);
});
});
@@ -332,7 +332,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);
});
});
@@ -453,7 +453,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
@@ -777,7 +777,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
let dave: IKeyringPair;
[alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);
@@ -977,7 +977,7 @@
await usingPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
});
});
@@ -1002,7 +1002,7 @@
])).to.be.rejectedWith(/common\.NoPermission/);
});
- itSub('Forbids mutating token property with tokenOwher==true when signer doesn\'t have all pieces', async ({helper}) => {
+ itSub('Forbids mutating token property with tokenOwner==true when signer doesn\'t have all pieces', async ({helper}) => {
const token = await prepare(helper);
await expect(token.collection.setTokenPropertyPermissions(alice, [{key: 'fractals', permission: {mutable:true, tokenOwner: true}}]))
tests/src/nesting/unnest.test.tsdiffbeforeafterboth--- a/tests/src/nesting/unnest.test.ts
+++ b/tests/src/nesting/unnest.test.ts
@@ -22,7 +22,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice] = await helper.arrange.createAccounts([50n], donor);
});
});
@@ -91,7 +91,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);
});
});
tests/src/nextSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/nextSponsoring.test.ts
+++ b/tests/src/nextSponsoring.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([20n, 10n], donor);
});
});
tests/src/refungible.test.tsdiffbeforeafterboth--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -20,6 +20,7 @@
const MAX_REFUNGIBLE_PIECES = 1_000_000_000_000_000_000_000n;
describe('integration test: Refungible functionality:', async () => {
+ let donor: IKeyringPair;
let alice: IKeyringPair;
let bob: IKeyringPair;
@@ -27,7 +28,7 @@
await usingPlaygrounds(async (helper, privateKey) => {
requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);
- const donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);
});
});
@@ -61,9 +62,9 @@
.to.eventually.be.rejectedWith(/refungible\.WrongRefungiblePieces/);
});
- itSub('RPC method tokenOnewrs for refungible collection and token', async ({helper, privateKey}) => {
+ itSub('RPC method tokenOnewrs for refungible collection and token', async ({helper}) => {
const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
- const facelessCrowd = Array(7).fill(0).map((_, i) => ({Substrate: privateKey(`//Alice+${i}`).address}));
+ const facelessCrowd = (await helper.arrange.createAccounts(Array(7).fill(0n), donor)).map(keyring => {return {Substrate: keyring.address};});
const collection = await helper.rft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
@@ -82,7 +83,7 @@
expect(owners).to.deep.include.members([{Substrate: alice.address}, ethAcc, {Substrate: bob.address}, ...facelessCrowd]);
expect(owners.length).to.be.equal(10);
- const eleven = privateKey('//ALice+11');
+ const [eleven] = await helper.arrange.createAccounts([0n], donor);
expect(await token.transfer(alice, {Substrate: eleven.address}, 10n)).to.be.true;
expect((await token.getTop10Owners()).length).to.be.equal(10);
});
tests/src/removeCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -23,7 +23,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([20n, 10n], donor);
});
});
@@ -62,7 +62,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([20n, 10n, 10n], donor);
});
});
tests/src/removeCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionSponsor.test.ts
+++ b/tests/src/removeCollectionSponsor.test.ts
@@ -24,7 +24,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([10n, 10n], donor);
});
});
@@ -78,7 +78,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([20n, 10n, 10n], donor);
});
});
tests/src/rpc.test.tsdiffbeforeafterboth--- a/tests/src/rpc.test.ts
+++ b/tests/src/rpc.test.ts
@@ -25,7 +25,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([20n, 10n], donor);
});
});
tests/src/setCollectionLimits.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionLimits.test.ts
+++ b/tests/src/setCollectionLimits.test.ts
@@ -29,7 +29,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([20n, 10n], donor);
});
});
@@ -104,7 +104,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([20n, 10n], donor);
});
});
tests/src/setCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionSponsor.test.ts
+++ b/tests/src/setCollectionSponsor.test.ts
@@ -24,7 +24,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([20n, 10n, 10n], donor);
});
});
@@ -93,7 +93,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([10n, 5n], donor);
});
});
tests/src/setPermissions.test.tsdiffbeforeafterboth--- a/tests/src/setPermissions.test.ts
+++ b/tests/src/setPermissions.test.ts
@@ -23,7 +23,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([10n, 10n], donor);
});
});
@@ -79,7 +79,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([10n, 10n], donor);
});
});
tests/src/transfer.test.tsdiffbeforeafterboth--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -19,12 +19,13 @@
import {itSub, Pallets, usingPlaygrounds, expect} from './util/playgrounds';
describe('Integration Test Transfer(recipient, collection_id, item_id, value)', () => {
+ let donor: IKeyringPair;
let alice: IKeyringPair;
let bob: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);
});
});
@@ -42,8 +43,7 @@
expect(bobsBalanceAfter > bobsBalanceBefore).to.be.true;
});
- itSub('Inability to pay fees error message is correct', async ({helper, privateKey}) => {
- const donor = privateKey('//Alice');
+ itSub('Inability to pay fees error message is correct', async ({helper}) => {
const [zero] = await helper.arrange.createAccounts([0n], donor);
// console.error = () => {};
@@ -117,7 +117,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);
});
});
@@ -256,7 +256,7 @@
before(async function() {
await usingEthPlaygrounds(async (_, privateKey) => {
- donor = privateKey('//Alice');
+ donor = await privateKey({filename: __filename});
});
});
tests/src/transferFrom.test.tsdiffbeforeafterboth--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -24,7 +24,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([20n, 10n, 10n], donor);
});
});
@@ -91,7 +91,7 @@
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
- const donor = privateKey('//Alice');
+ const donor = await privateKey({filename: __filename});
[alice, bob, charlie] = await helper.arrange.createAccounts([50n, 10n, 10n], donor);
});
});
tests/src/util/playgrounds/feedAlices.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/util/playgrounds/feedAlices.ts
@@ -0,0 +1,77 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+import * as path from 'path';
+import {promises as fs} from 'fs';
+import {usingPlaygrounds} from '.';
+
+async function getFiles(rootPath: string): Promise<string[]> {
+ const files = await fs.readdir(rootPath, {withFileTypes: true});
+ const filenames: string[] = [];
+ for (const entry of files) {
+ const res = path.resolve(rootPath, entry.name);
+ if (entry.isDirectory()) {
+ filenames.push(...await getFiles(res));
+ } else {
+ filenames.push(res);
+ }
+ }
+ return filenames;
+}
+
+const fundFilenames = async () => {
+ await usingPlaygrounds(async (helper, privateKey) => {
+ const oneToken = helper.balance.getOneTokenNominal();
+ const alice = await privateKey('//Alice');
+ const nonce = await helper.chain.getNonce(alice.address);
+ const filenames = await getFiles(path.resolve(__dirname, '../..'));
+
+ console.log(`Main Alice address: ${alice.address}, with balance:`, await helper.balance.getSubstrate(alice.address));
+
+ const batchSize = 20;
+ let balanceGrantedCounter = 0;
+ for (let b = 0; b < filenames.length; b += batchSize) {
+ const tx = [];
+ let batchBalanceGrantedCounter = 0;
+ for (const f of filenames.slice(b, b + batchSize)) {
+ if (!f.endsWith('.test.ts')) continue;
+ const account = await privateKey({filename: f});
+ const aliceBalance = await helper.balance.getSubstrate(account.address);
+
+ if (aliceBalance < 5000n * oneToken) {
+ tx.push(helper.executeExtrinsic(
+ alice,
+ 'api.tx.balances.transfer',
+ [account.address, 10000n * oneToken],
+ true,
+ {nonce: nonce + balanceGrantedCounter++},
+ ).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));
+ batchBalanceGrantedCounter++;
+ }
+ }
+
+ if(tx.length > 0) {
+ console.log(`Granting funds to ${batchBalanceGrantedCounter} filename accounts.`);
+ const result = await Promise.all(tx);
+ if (result && result.lastIndexOf(false) > -1) throw new Error('The transactions actually probably succeeded, should check the balances.');
+ }
+ }
+
+ if (balanceGrantedCounter == 0) console.log('No account needs additional funding.');
+ });
+};
+
+const fundFilenamesWithRetries = async (retriesLeft: number): Promise<boolean> => {
+ if (retriesLeft <= 0) return Promise.resolve(false);
+ return fundFilenames()
+ .then(() => Promise.resolve(true))
+ .catch(() => {
+ console.error(`Some transactions have failed. ${retriesLeft >= 1 ? 'Retrying...' : 'Something is wrong.'}`);
+ return fundFilenamesWithRetries(--retriesLeft);
+ });
+};
+
+fundFilenamesWithRetries(2).then((result) => process.exit(result ? 0 : 1)).catch(e => {
+ console.error(e);
+ process.exit(1);
+});
tests/src/util/playgrounds/index.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/index.ts
+++ b/tests/src/util/playgrounds/index.ts
@@ -1,6 +1,8 @@
// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
// SPDX-License-Identifier: Apache-2.0
+import * as path from 'path';
+import * as crypto from 'crypto';
import {IKeyringPair} from '@polkadot/types/types';
import chai from 'chai';
import chaiAsPromised from 'chai-as-promised';
@@ -12,7 +14,16 @@
chai.use(chaiAsPromised);
export const expect = chai.expect;
-export const usingPlaygrounds = async (code: (helper: DevUniqueHelper, privateKey: (seed: string) => IKeyringPair) => Promise<void>, url: string = config.substrateUrl) => {
+const getTestHash = (filename: string) => {
+ return crypto.createHash('md5').update(path.basename(filename)).digest('hex');
+};
+
+export const getTestSeed = (filename: string) => {
+ return `//Alice+${getTestHash(filename)}`;
+};
+
+// todo:playgrounds normalize to seed and filename
+export const usingPlaygrounds = async (code: (helper: DevUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair>) => Promise<void>, url: string = config.substrateUrl) => {
const silentConsole = new SilentConsole();
silentConsole.enable();
@@ -21,7 +32,20 @@
try {
await helper.connect(url);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const privateKey = (seed: string) => helper.util.fromSeed(seed, ss58Format);
+ const privateKey = async (seed: string | {filename: string}) => {
+ if (typeof seed === 'string') {
+ return helper.util.fromSeed(seed, ss58Format);
+ }
+ else {
+ const actualSeed = getTestSeed(seed.filename);
+ let account = helper.util.fromSeed(actualSeed, ss58Format);
+ if (await helper.balance.getSubstrate(account.address) == 0n) {
+ console.warn(`${path.basename(seed.filename)}: Not enough funds present on the filename account. Using the default one as the donor instead.`);
+ account = helper.util.fromSeed('//Alice', ss58Format);
+ }
+ return account;
+ }
+ };
await code(helper, privateKey);
}
finally {
@@ -50,7 +74,7 @@
}
}
-export async function itSub(name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export async function itSub(name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
(opts.only ? it.only :
opts.skip ? it.skip : it)(name, async function () {
await usingPlaygrounds(async (helper, privateKey) => {
@@ -62,12 +86,12 @@
});
});
}
-export async function itSubIfWithPallet(name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
+export async function itSubIfWithPallet(name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any, opts: { only?: boolean, skip?: boolean, requiredPallets?: string[] } = {}) {
return itSub(name, cb, {requiredPallets: required, ...opts});
}
-itSub.only = (name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itSub(name, cb, {only: true});
-itSub.skip = (name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itSub(name, cb, {skip: true});
+itSub.only = (name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSub(name, cb, {only: true});
+itSub.skip = (name: string, cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSub(name, cb, {skip: true});
-itSubIfWithPallet.only = (name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itSubIfWithPallet(name, required, cb, {only: true});
-itSubIfWithPallet.skip = (name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => IKeyringPair }) => any) => itSubIfWithPallet(name, required, cb, {skip: true});
+itSubIfWithPallet.only = (name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSubIfWithPallet(name, required, cb, {only: true});
+itSubIfWithPallet.skip = (name: string, required: string[], cb: (apis: { helper: DevUniqueHelper, privateKey: (seed: string) => Promise<IKeyringPair> }) => any) => itSubIfWithPallet(name, required, cb, {skip: true});
itSub.ifWithPallets = itSubIfWithPallet;