difftreelog
Merge remote-tracking branch 'origin/develop' into feature/NFTPAR-265
in: master
13 files changed
tests/src/change-collection-owner.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/change-collection-owner.test.ts
@@ -0,0 +1,59 @@
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import privateKey from './substrate/privateKey';
+import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from "./substrate/substrate-api";
+import { createCollectionExpectSuccess, createCollectionExpectFailure } from "./util/helpers";
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+
+describe('Integration Test changeCollectionOwner(collection_id, new_owner):', () => {
+ it('Changing owner changes owner.', async () => {
+ await usingApi(async api => {
+ const collectionId = await createCollectionExpectSuccess();
+ const alice = privateKey('//Alice');
+ const bob = privateKey('//Bob');
+
+ const collection: any = (await api.query.nft.collection(collectionId));
+ expect(collection.Owner.toString()).to.be.eq(alice.address);
+
+ const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
+ await submitTransactionAsync(alice, changeOwnerTx);
+
+ const collectionAfterOwnerChange: any = (await api.query.nft.collection(collectionId));
+ expect(collectionAfterOwnerChange.Owner.toString()).to.be.eq(bob.address);
+ });
+ });
+});
+
+describe('Negative Integration Test changeCollectionOwner(collection_id, new_owner):', () => {
+ it(`Not owner can't change owner.`, async () => {
+ await usingApi(async api => {
+ const collectionId = await createCollectionExpectSuccess();
+ const alice = privateKey('//Alice');
+ const bob = privateKey('//Bob');
+
+ const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
+ await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;
+
+ const collectionAfterOwnerChange: any = (await api.query.nft.collection(collectionId));
+ expect(collectionAfterOwnerChange.Owner.toString()).to.be.eq(alice.address);
+
+ // Verifying that nothing bad happened (network is live, new collections can be created, etc.)
+ await createCollectionExpectSuccess();
+ });
+ });
+ it(`Can't change owner of not existing collection.`, async () => {
+ await usingApi(async api => {
+ const collectionId = (1<<32) - 1;
+ const alice = privateKey('//Alice');
+ const bob = privateKey('//Bob');
+
+ const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
+ await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
+
+ // Verifying that nothing bad happened (network is live, new collections can be created, etc.)
+ await createCollectionExpectSuccess();
+ });
+ });
+});
tests/src/confirmSponsorship.test.tsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56import chai from 'chai';7import chaiAsPromised from 'chai-as-promised';8import { default as usingApi, submitTransactionAsync } from "./substrate/substrate-api";9import { 10 createCollectionExpectSuccess, 11 setCollectionSponsorExpectSuccess, 12 destroyCollectionExpectSuccess, 13 setCollectionSponsorExpectFailure,14 confirmSponsorshipExpectSuccess,15 confirmSponsorshipExpectFailure,16 createItemExpectSuccess,17 findUnusedAddress,18 getGenericResult,19 enableWhiteListExpectSuccess,20 enablePublicMintingExpectSuccess,21 addToWhiteListExpectSuccess,22} from "./util/helpers";23import { Keyring } from "@polkadot/api";24import { IKeyringPair } from "@polkadot/types/types";25import type { AccountId } from '@polkadot/types/interfaces';26import { BigNumber } from 'bignumber.js';2728chai.use(chaiAsPromised);29const expect = chai.expect;3031let alice: IKeyringPair;32let bob: IKeyringPair;33let charlie: IKeyringPair;3435describe('integration test: ext. confirmSponsorship():', () => {3637 before(async () => {38 await usingApi(async (api) => {39 const keyring = new Keyring({ type: 'sr25519' });40 alice = keyring.addFromUri(`//Alice`);41 bob = keyring.addFromUri(`//Bob`);42 charlie = keyring.addFromUri(`//Charlie`);43 });44 });4546 it('Confirm collection sponsorship', async () => {47 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');48 await setCollectionSponsorExpectSuccess(collectionId, bob.address);49 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');50 });51 it('Add sponsor to a collection after the same sponsor was already added and confirmed', async () => {52 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');53 await setCollectionSponsorExpectSuccess(collectionId, bob.address);54 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');55 await setCollectionSponsorExpectSuccess(collectionId, bob.address);56 });57 it('Add new sponsor to a collection after another sponsor was already added and confirmed', async () => {58 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');59 await setCollectionSponsorExpectSuccess(collectionId, bob.address);60 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');61 await setCollectionSponsorExpectSuccess(collectionId, charlie.address);62 });6364 it('NFT: Transfer fees are paid by the sponsor after confirmation', async () => {65 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');66 await setCollectionSponsorExpectSuccess(collectionId, bob.address);67 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');6869 await usingApi(async (api) => {70 const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());7172 // Find unused address73 const zeroBalance = await findUnusedAddress(api);7475 // Mint token for unused address76 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', zeroBalance.address);7778 // Transfer this tokens from unused address to Alice79 const zeroToAlice = api.tx.nft.transfer(zeroBalance.address, collectionId, itemId, 0);80 const events = await submitTransactionAsync(zeroBalance, zeroToAlice);81 const result = getGenericResult(events);8283 const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());8485 expect(result.success).to.be.true;86 expect(BsponsorBalance.lt(AsponsorBalance)).to.be.true;87 });8889 });9091 it('Fungible: Transfer fees are paid by the sponsor after confirmation', async () => {92 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'Fungible');93 await setCollectionSponsorExpectSuccess(collectionId, bob.address);94 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');9596 await usingApi(async (api) => {97 const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());9899 // Find unused address100 const zeroBalance = await findUnusedAddress(api);101102 // Mint token for unused address103 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', zeroBalance.address);104105 // Transfer this tokens from unused address to Alice106 const zeroToAlice = api.tx.nft.transfer(zeroBalance.address, collectionId, itemId, 1);107 const events1 = await submitTransactionAsync(zeroBalance, zeroToAlice);108 const result1 = getGenericResult(events1);109110 const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());111112 expect(result1.success).to.be.true;113 expect(BsponsorBalance.lt(AsponsorBalance)).to.be.true;114 });115 });116117 it('ReFungible: Transfer fees are paid by the sponsor after confirmation', async () => {118 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'ReFungible');119 await setCollectionSponsorExpectSuccess(collectionId, bob.address);120 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');121122 await usingApi(async (api) => {123 const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());124125 // Find unused address126 const zeroBalance = await findUnusedAddress(api);127128 // Mint token for unused address129 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', zeroBalance.address);130131 // Transfer this tokens from unused address to Alice132 const zeroToAlice = api.tx.nft.transfer(zeroBalance.address, collectionId, itemId, 1);133 const events1 = await submitTransactionAsync(zeroBalance, zeroToAlice);134 const result1 = getGenericResult(events1);135136 const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());137138 expect(result1.success).to.be.true;139 expect(BsponsorBalance.lt(AsponsorBalance)).to.be.true;140 });141 });142143 it('CreateItem fees are paid by the sponsor after confirmation', async () => {144 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');145 await setCollectionSponsorExpectSuccess(collectionId, bob.address);146 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');147148 // Enable collection white list 149 await enableWhiteListExpectSuccess(alice, collectionId);150151 // Enable public minting152 await enablePublicMintingExpectSuccess(alice, collectionId);153154 // Create Item 155 await usingApi(async (api) => {156 const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());157158 // Find unused address159 const zeroBalance = await findUnusedAddress(api);160161 // Add zeroBalance address to white list162 await addToWhiteListExpectSuccess(alice, collectionId, zeroBalance.address);163164 // Mint token using unused address as signer165 const tokenId = await createItemExpectSuccess(zeroBalance, collectionId, 'NFT', zeroBalance.address);166167 const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());168169 expect(BsponsorBalance.lt(AsponsorBalance)).to.be.true;170 });171 });172173 it('NFT: Sponsoring is rate limited', async () => {174 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');175 await setCollectionSponsorExpectSuccess(collectionId, bob.address);176 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');177178 await usingApi(async (api) => {179 // Find unused address180 const zeroBalance = await findUnusedAddress(api);181182 // Mint token for alice183 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', alice.address);184185 // Transfer this token from Alice to unused address and back186 // Alice to Zero gets sponsored187 const aliceToZero = api.tx.nft.transfer(zeroBalance.address, collectionId, itemId, 0);188 const events1 = await submitTransactionAsync(alice, aliceToZero);189 const result1 = getGenericResult(events1);190191 // Second transfer should fail192 const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());193 const zeroToAlice = api.tx.nft.transfer(alice.address, collectionId, itemId, 0);194 const badTransaction = async function () { 195 console.log = function () {};196 console.error = function () {};197 await submitTransactionAsync(zeroBalance, zeroToAlice);198 delete console.log;199 delete console.error;200 };201 await expect(badTransaction()).to.be.rejectedWith("Inability to pay some fees");202 const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());203204 // Try again after Zero gets some balance - now it should succeed205 const balancetx = api.tx.balances.transfer(zeroBalance.address, 1e15);206 await submitTransactionAsync(alice, balancetx);207 const events2 = await submitTransactionAsync(zeroBalance, zeroToAlice);208 const result2 = getGenericResult(events2);209210 expect(result1.success).to.be.true;211 expect(result2.success).to.be.true;212 expect(BsponsorBalance.isEqualTo(AsponsorBalance)).to.be.true;213 });214 });215216 it('Fungible: Sponsoring is rate limited', async () => {217 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'Fungible');218 await setCollectionSponsorExpectSuccess(collectionId, bob.address);219 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');220221 await usingApi(async (api) => {222 // Find unused address223 const zeroBalance = await findUnusedAddress(api);224225 // Mint token for unused address226 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', zeroBalance.address);227228 // Transfer this tokens in parts from unused address to Alice229 const zeroToAlice = api.tx.nft.transfer(zeroBalance.address, collectionId, itemId, 1);230 const events1 = await submitTransactionAsync(zeroBalance, zeroToAlice);231 const result1 = getGenericResult(events1);232233 const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());234235 const badTransaction = async function () { 236 console.log = function () {};237 console.error = function () {};238 await submitTransactionAsync(zeroBalance, zeroToAlice);239 delete console.log;240 delete console.error;241 };242243 const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());244245 // Try again after Zero gets some balance - now it should succeed246 const balancetx = api.tx.balances.transfer(zeroBalance.address, 1e15);247 await submitTransactionAsync(alice, balancetx);248 const events2 = await submitTransactionAsync(zeroBalance, zeroToAlice);249 const result2 = getGenericResult(events2);250251 expect(result1.success).to.be.true;252 expect(result2.success).to.be.true;253 expect(BsponsorBalance.isEqualTo(AsponsorBalance)).to.be.true;254 });255 });256257 it('ReFungible: Sponsoring is rate limited', async () => {258 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'ReFungible');259 await setCollectionSponsorExpectSuccess(collectionId, bob.address);260 await confirmSponsorshipExpectSuccess(collectionId, '//Bob');261262 await usingApi(async (api) => {263 // Find unused address264 const zeroBalance = await findUnusedAddress(api);265266 // Mint token for alice267 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', alice.address);268269 // Transfer this token from Alice to unused address and back270 // Alice to Zero gets sponsored271 const aliceToZero = api.tx.nft.transfer(zeroBalance.address, collectionId, itemId, 1);272 const events1 = await submitTransactionAsync(alice, aliceToZero);273 const result1 = getGenericResult(events1);274275 // Second transfer should fail276 const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());277 const zeroToAlice = api.tx.nft.transfer(alice.address, collectionId, itemId, 1);278 const badTransaction = async function () { 279 console.log = function () {};280 console.error = function () {};281 await submitTransactionAsync(zeroBalance, zeroToAlice);282 delete console.log;283 delete console.error;284 };285 await expect(badTransaction()).to.be.rejectedWith("Inability to pay some fees");286 const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());287288 // Try again after Zero gets some balance - now it should succeed289 const balancetx = api.tx.balances.transfer(zeroBalance.address, 1e15);290 await submitTransactionAsync(alice, balancetx);291 const events2 = await submitTransactionAsync(zeroBalance, zeroToAlice);292 const result2 = getGenericResult(events2);293294 expect(result1.success).to.be.true;295 expect(result2.success).to.be.true;296 expect(BsponsorBalance.isEqualTo(AsponsorBalance)).to.be.true;297 });298 });299300});301302describe('(!negative test!) integration test: ext. removeCollectionSponsor():', () => {303 before(async () => {304 await usingApi(async (api) => {305 const keyring = new Keyring({ type: 'sr25519' });306 alice = keyring.addFromUri(`//Alice`);307 bob = keyring.addFromUri(`//Bob`);308 charlie = keyring.addFromUri(`//Charlie`);309 });310 });311312 it('(!negative test!) Confirm sponsorship for a collection that never existed', async () => {313 // Find the collection that never existed314 const collectionId = 0;315 await usingApi(async (api) => {316 const collectionId = parseInt((await api.query.nft.createdCollectionCount()).toString()) + 1;317 });318319 await confirmSponsorshipExpectFailure(collectionId, '//Bob');320 });321322 it('(!negative test!) Confirm sponsorship using a non-sponsor address', async () => {323 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');324 await setCollectionSponsorExpectSuccess(collectionId, bob.address);325326 await usingApi(async (api) => {327 const transfer = api.tx.balances.transfer(charlie.address, 1e15);328 await submitTransactionAsync(alice, transfer);329 });330331 await confirmSponsorshipExpectFailure(collectionId, '//Charlie');332 });333334 it('(!negative test!) Confirm sponsorship using owner address', async () => {335 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');336 await setCollectionSponsorExpectSuccess(collectionId, bob.address);337 await confirmSponsorshipExpectFailure(collectionId, '//Alice');338 });339340 it('(!negative test!) Confirm sponsorship without sponsor being set with setCollectionSponsor', async () => {341 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');342 await confirmSponsorshipExpectFailure(collectionId, '//Bob');343 });344 345 it('(!negative test!) Confirm sponsorship in a collection that was destroyed', async () => {346 const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');347 await destroyCollectionExpectSuccess(collectionId);348 await confirmSponsorshipExpectFailure(collectionId, '//Bob');349 });350});tests/src/connection.test.tsdiffbeforeafterboth--- a/tests/src/connection.test.ts
+++ b/tests/src/connection.test.ts
@@ -21,6 +21,8 @@
});
it('Cannot connect to 255.255.255.255', async () => {
+ const log = console.log;
+ const error = console.error;
console.log = function () {};
console.error = function () {};
@@ -31,7 +33,7 @@
}, { provider: neverConnectProvider });
})()).to.be.eventually.rejected;
- delete console.log;
- delete console.error;
+ console.log = log;
+ console.error = error;
});
});
\ No newline at end of file
tests/src/contracts.test.tsdiffbeforeafterboth--- a/tests/src/contracts.test.ts
+++ b/tests/src/contracts.test.ts
@@ -111,9 +111,6 @@
const bob = privateKey("//Bob");
const [contract, deployer] = await deployFlipper(api);
- const consoleError = console.error;
- console.error = (...data: any[]) => {
- };
let expectedFlipValue = await getFlipValue(contract, deployer);
@@ -168,7 +165,6 @@
const afterWhiteListDisabled = await getFlipValue(contract,deployer);
expect(afterWhiteListDisabled).to.be.eq(expectedFlipValue, `Anyone can call contract with disabled whitelist.`);
- console.error = consoleError;
});
});
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -6,37 +6,29 @@
import chai from 'chai';
import chaiAsPromised from 'chai-as-promised';
import { default as usingApi } from "./substrate/substrate-api";
-import { createCollectionExpectSuccess, createCollectionExpectFailure } from "./util/helpers";
+import { createCollectionExpectSuccess, createCollectionExpectFailure, CollectionMode } from "./util/helpers";
chai.use(chaiAsPromised);
const expect = chai.expect;
describe('integration test: ext. createCollection():', () => {
it('Create new NFT collection', async () => {
- await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ await createCollectionExpectSuccess({name: 'A', description: 'B', tokenPrefix: 'C', mode: 'NFT'});
});
it('Create new NFT collection whith collection_name of maximum length (64 bytes)', async () => {
- await createCollectionExpectSuccess(
- 'ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCD',
- '1', '1', 'NFT');
+ await createCollectionExpectSuccess({name: 'A'.repeat(64)});
});
it('Create new NFT collection whith collection_description of maximum length (256 bytes)', async () => {
- await createCollectionExpectSuccess(
- 'A',
- 'ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJabcdef',
- '1', 'NFT');
+ await createCollectionExpectSuccess({description: 'A'.repeat(256)});
});
it('Create new NFT collection whith token_prefix of maximum length (16 bytes)', async () => {
- await createCollectionExpectSuccess(
- '1',
- '1',
- 'ABCDEFGHIJABCDEF', 'NFT');
+ await createCollectionExpectSuccess({tokenPrefix: 'A'.repeat(16)});
});
it('Create new Fungible collection', async () => {
- await createCollectionExpectSuccess('1', '1', '1', 'Fungible');
+ await createCollectionExpectSuccess({mode: 'Fungible'});
});
it('Create new ReFungible collection', async () => {
- await createCollectionExpectSuccess('1', '1', '1', 'ReFungible');
+ await createCollectionExpectSuccess({mode: 'ReFungible'});
});
});
@@ -46,7 +38,7 @@
const AcollectionCount = parseInt((await api.query.nft.collectionCount()).toString());
const badTransaction = async function () {
- await createCollectionExpectSuccess('1', '1', '1', 'BadMode');
+ await createCollectionExpectSuccess({mode: 'BadMode' as CollectionMode});
};
expect(badTransaction()).to.be.rejected;
@@ -55,18 +47,12 @@
});
});
it('(!negative test!) create new NFT collection whith incorrect data (collection_name)', async () => {
- await createCollectionExpectFailure(
- 'ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDE',
- '1', '1', 'NFT');
+ await createCollectionExpectFailure({name: 'A'.repeat(65)});
});
it('(!negative test!) create new NFT collection whith incorrect data (collection_description)', async () => {
- await createCollectionExpectFailure('1',
- 'ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJabcdefg',
- '1', 'NFT');
+ await createCollectionExpectFailure({description: 'A'.repeat(257)});
});
it('(!negative test!) create new NFT collection whith incorrect data (token_prefix)', async () => {
- await createCollectionExpectFailure('1', '1',
- 'ABCDEFGHIJABCDEFG',
- 'NFT');
+ await createCollectionExpectFailure({tokenPrefix: 'A'.repeat(17)});
});
});
tests/src/createItem.test.tsdiffbeforeafterboth--- a/tests/src/createItem.test.ts
+++ b/tests/src/createItem.test.ts
@@ -18,17 +18,17 @@
it('Create new item in NFT collection', async () => {
const createMode = 'NFT';
- const newCollectionID = await createCollectionExpectSuccess('0', '0', '0', createMode);
+ const newCollectionID = await createCollectionExpectSuccess({mode: createMode});
await createItemExpectSuccess(alice, newCollectionID, createMode);
});
it('Create new item in Fungible collection', async () => {
const createMode = 'Fungible';
- const newCollectionID = await createCollectionExpectSuccess('0', '0', '0', createMode);
+ const newCollectionID = await createCollectionExpectSuccess({mode: createMode});
await createItemExpectSuccess(alice, newCollectionID, createMode);
});
it('Create new item in ReFungible collection', async () => {
const createMode = 'ReFungible';
- const newCollectionID = await createCollectionExpectSuccess('0', '0', '0', createMode);
+ const newCollectionID = await createCollectionExpectSuccess({mode: createMode});
await createItemExpectSuccess(alice, newCollectionID, createMode);
});
});
tests/src/creditFeesToTreasury.test.tsdiffbeforeafterboth--- a/tests/src/creditFeesToTreasury.test.ts
+++ b/tests/src/creditFeesToTreasury.test.ts
@@ -5,7 +5,7 @@
import chai from 'chai';
import chaiAsPromised from 'chai-as-promised';
-import { default as usingApi, submitTransactionAsync } from "./substrate/substrate-api";
+import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from "./substrate/substrate-api";
import { alicesPublicKey, bobsPublicKey } from "./accounts";
import privateKey from "./substrate/privateKey";
import { BigNumber } from 'bignumber.js';
@@ -63,14 +63,13 @@
const bobBalanceBefore = new BigNumber((await api.query.system.account(bobsPublicKey)).data.free.toString());
const badTx = api.tx.balances.setBalance(alicesPublicKey, 0, 0);
- const result = getGenericResult(await submitTransactionAsync(bobPrivateKey, badTx));
+ await expect(submitTransactionExpectFailAsync(bobPrivateKey, badTx)).to.be.rejected;
const treasuryBalanceAfter = new BigNumber((await api.query.system.account(Treasury)).data.free.toString());
const bobBalanceAfter = new BigNumber((await api.query.system.account(bobsPublicKey)).data.free.toString());
const fee = bobBalanceBefore.minus(bobBalanceAfter);
const treasuryIncrease = treasuryBalanceAfter.minus(treasuryBalanceBefore);
- expect(result.success).to.be.false;
expect(treasuryIncrease.toFixed()).to.be.equal(fee.toFixed());
});
});
@@ -80,7 +79,7 @@
const treasuryBalanceBefore = new BigNumber((await api.query.system.account(Treasury)).data.free.toString());
const aliceBalanceBefore = new BigNumber((await api.query.system.account(alicesPublicKey)).data.free.toString());
- await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ await createCollectionExpectSuccess();
const treasuryBalanceAfter = new BigNumber((await api.query.system.account(Treasury)).data.free.toString());
const aliceBalanceAfter = new BigNumber((await api.query.system.account(alicesPublicKey)).data.free.toString());
@@ -96,7 +95,7 @@
const treasuryBalanceBefore = new BigNumber((await api.query.system.account(Treasury)).data.free.toString());
const aliceBalanceBefore = new BigNumber((await api.query.system.account(alicesPublicKey)).data.free.toString());
- await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ await createCollectionExpectSuccess();
const treasuryBalanceAfter = new BigNumber((await api.query.system.account(Treasury)).data.free.toString());
const aliceBalanceAfter = new BigNumber((await api.query.system.account(alicesPublicKey)).data.free.toString());
tests/src/destroyCollection.test.tsdiffbeforeafterboth--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -10,15 +10,15 @@
describe('integration test: ext. destroyCollection():', () => {
it('NFT collection can be destroyed', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(collectionId);
});
it('Fungible collection can be destroyed', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'Fungible');
+ const collectionId = await createCollectionExpectSuccess({ mode: 'Fungible' });
await destroyCollectionExpectSuccess(collectionId);
});
it('ReFungible collection can be destroyed', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'ReFungible');
+ const collectionId = await createCollectionExpectSuccess({ mode: 'ReFungible' });
await destroyCollectionExpectSuccess(collectionId);
});
});
@@ -32,12 +32,12 @@
});
});
it('(!negative test!) Destroy a collection that has already been destroyed', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(collectionId);
await destroyCollectionExpectFailure(collectionId);
});
it('(!negative test!) Destroy a collection using non-owner account', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectFailure(collectionId, '//Bob');
await destroyCollectionExpectSuccess(collectionId, '//Alice');
});
tests/src/removeCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionSponsor.test.ts
+++ b/tests/src/removeCollectionSponsor.test.ts
@@ -5,7 +5,7 @@
import chai from 'chai';
import chaiAsPromised from 'chai-as-promised';
-import { default as usingApi, submitTransactionAsync } from "./substrate/substrate-api";
+import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from "./substrate/substrate-api";
import {
createCollectionExpectSuccess,
setCollectionSponsorExpectSuccess,
@@ -46,7 +46,7 @@
});
it('Remove NFT collection sponsor stops sponsorship', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await confirmSponsorshipExpectSuccess(collectionId, '//Bob');
await removeCollectionSponsorExpectSuccess(collectionId);
@@ -62,11 +62,7 @@
const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());
const zeroToAlice = api.tx.nft.transfer(alice.address, collectionId, itemId, 0);
const badTransaction = async function () {
- console.log = function () {};
- console.error = function () {};
- await submitTransactionAsync(zeroBalance, zeroToAlice);
- delete console.log;
- delete console.error;
+ await submitTransactionExpectFailAsync(zeroBalance, zeroToAlice);
};
await expect(badTransaction()).to.be.rejectedWith("Inability to pay some fees");
const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());
@@ -76,7 +72,7 @@
});
it('Remove a sponsor after it was already removed', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await confirmSponsorshipExpectSuccess(collectionId, '//Bob');
await removeCollectionSponsorExpectSuccess(collectionId);
@@ -84,12 +80,12 @@
});
it('Remove sponsor in a collection that never had the sponsor set', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await removeCollectionSponsorExpectSuccess(collectionId);
});
it('Remove sponsor for a collection that had the sponsor set, but not confirmed', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await removeCollectionSponsorExpectSuccess(collectionId);
});
@@ -117,21 +113,21 @@
});
it('(!negative test!) Remove sponsor in a destroyed collection', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await destroyCollectionExpectSuccess(collectionId);
await removeCollectionSponsorExpectFailure(collectionId);
});
it('Set - remove - confirm: fails', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await removeCollectionSponsorExpectSuccess(collectionId);
await confirmSponsorshipExpectFailure(collectionId, '//Bob');
});
it('Set - confirm - remove - confirm: Sponsor cannot come back', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await confirmSponsorshipExpectSuccess(collectionId, '//Bob');
await removeCollectionSponsorExpectSuccess(collectionId);
tests/src/setCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionSponsor.test.ts
+++ b/tests/src/setCollectionSponsor.test.ts
@@ -26,25 +26,25 @@
});
it('Set NFT collection sponsor', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
});
it('Set Fungible collection sponsor', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'Fungible');
+ const collectionId = await createCollectionExpectSuccess({ mode: 'Fungible' });
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
});
it('Set ReFungible collection sponsor', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'ReFungible');
+ const collectionId = await createCollectionExpectSuccess({ mode: 'ReFungible' });
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
});
it('Set the same sponsor repeatedly', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
});
it('Replace collection sponsor', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
const keyring = new Keyring({ type: 'sr25519' });
const charlie = keyring.addFromUri(`//Charlie`);
@@ -62,7 +62,7 @@
});
it('(!negative test!) Add sponsor with a non-owner', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectFailure(collectionId, bob.address, '//Bob');
});
it('(!negative test!) Add sponsor to a collection that never existed', async () => {
@@ -75,7 +75,7 @@
await setCollectionSponsorExpectFailure(collectionId, bob.address);
});
it('(!negative test!) Add sponsor to a collection that was destroyed', async () => {
- const collectionId = await createCollectionExpectSuccess('A', 'B', 'C', 'NFT');
+ const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(collectionId);
await setCollectionSponsorExpectFailure(collectionId, bob.address);
});
tests/src/substrate/substrate-api.tsdiffbeforeafterboth--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -33,21 +33,42 @@
}
}
+enum TransactionStatus {
+ Success,
+ Fail,
+ NotReady
+}
+
+function getTransactionStatus(events: EventRecord[], status: ExtrinsicStatus): TransactionStatus {
+ if (status.isReady) {
+ return TransactionStatus.NotReady;
+ }
+ if (status.isBroadcast) {
+ return TransactionStatus.NotReady;
+ }
+ if (status.isInBlock || status.isFinalized) {
+ if(events.filter(e => e.event.data.method === 'ExtrinsicFailed').length > 0) {
+ return TransactionStatus.Fail;
+ }
+ if(events.filter(e => e.event.data.method === 'ExtrinsicSuccess').length > 0) {
+ return TransactionStatus.Success;
+ }
+ }
+
+ return TransactionStatus.Fail;
+}
+
export function submitTransactionAsync(sender: IKeyringPair, transaction: SubmittableExtrinsic<ApiTypes>): Promise<EventRecord[]> {
return new Promise(async function(resolve, reject) {
try {
await transaction.signAndSend(sender, ({ events = [], status }) => {
- if (status.isReady) {
- // nothing to do
- // console.log(`Current tx status is Ready`);
- } else if (status.isBroadcast) {
- // nothing to do
- // console.log(`Current tx status is Broadcast`);
- } else if (status.isInBlock || status.isFinalized) {
+ const transactionStatus = getTransactionStatus(events, status);
+
+ if (transactionStatus == TransactionStatus.Success) {
resolve(events);
- } else {
+ } else if (transactionStatus == TransactionStatus.Fail) {
console.log(`Something went wrong with transaction. Status: ${status}`);
- reject("Transaction failed");
+ reject(events);
}
});
} catch (e) {
@@ -58,19 +79,35 @@
}
export function submitTransactionExpectFailAsync(sender: IKeyringPair, transaction: SubmittableExtrinsic<ApiTypes>): Promise<EventRecord[]> {
- return new Promise(async function(resolve, reject) {
+ const consoleError = console.error;
+ const consoleLog = console.log;
+ console.error = () => {};
+ console.log = () => {};
+
+ return new Promise<EventRecord[]>(async function(res, rej) {
+ const resolve = (rec: EventRecord[]) => {
+ setTimeout(() => {
+ res(rec);
+ console.error = consoleError;
+ console.log = consoleLog;
+
+ });
+ };
+ const reject = (errror: any) => {
+ setTimeout(() => {
+ rej(errror);
+ console.error = consoleError;
+ console.log = consoleLog;
+ });
+ };
try {
await transaction.signAndSend(sender, ({ events = [], status }) => {
- if (status.isReady) {
- // nothing to do
- // console.log(`Current tx status is Ready`);
- } else if (status.isBroadcast) {
- // nothing to do
- // console.log(`Current tx status is Broadcast`);
- } else if (status.isInBlock || status.isFinalized) {
+ const transactionStatus = getTransactionStatus(events, status);
+
+ if (transactionStatus == TransactionStatus.Success) {
resolve(events);
- } else {
- reject("Transaction failed");
+ } else if (transactionStatus == TransactionStatus.Fail) {
+ reject(events);
}
});
} catch (e) {
tests/src/transfer.test.tsdiffbeforeafterboth--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -33,6 +33,8 @@
// Find unused address
const pk = await findUnusedAddress(api);
+ const error = console.error;
+ const log = console.log;
console.log = function () {};
console.error = function () {};
@@ -42,8 +44,8 @@
};
await expect(badTransaction()).to.be.rejectedWith("Inability to pay some fees");
- delete console.log;
- delete console.error;
+ console.log = log;
+ console.error = error;
});
});
});
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -7,7 +7,7 @@
import chaiAsPromised from 'chai-as-promised';
import type { AccountId, EventRecord } from '@polkadot/types/interfaces';
import { ApiPromise, Keyring } from "@polkadot/api";
-import { default as usingApi, submitTransactionAsync } from "../substrate/substrate-api";
+import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from "../substrate/substrate-api";
import privateKey from '../substrate/privateKey';
import { alicesPublicKey, nullPublicKey } from "../accounts";
import { strToUTF16, utf16ToStr, hexToStr } from '../util/util';
@@ -86,7 +86,24 @@
return result;
}
-export async function createCollectionExpectSuccess(name: string, description: string, tokenPrefix: string, mode: string): Promise<number> {
+export type CollectionMode = 'NFT' | 'Fungible' | 'ReFungible';
+export type CreateCollectionParams = {
+ mode: CollectionMode,
+ name: string,
+ description: string,
+ tokenPrefix: string
+};
+
+const defaultCreateCollectionParams: CreateCollectionParams = {
+ name: 'name',
+ description: 'description',
+ mode: 'NFT',
+ tokenPrefix: 'prefix'
+}
+
+export async function createCollectionExpectSuccess(params: Partial<CreateCollectionParams> = {}): Promise<number> {
+ const {name, description, mode, tokenPrefix } = {...defaultCreateCollectionParams, ...params};
+
let collectionId: number = 0;
await usingApi(async (api) => {
// Get number of collections before the transaction
@@ -120,15 +137,17 @@
return collectionId;
}
-export async function createCollectionExpectFailure(name: string, description: string, tokenPrefix: string, mode: string) {
+export async function createCollectionExpectFailure(params: Partial<CreateCollectionParams> = {}) {
+ const {name, description, mode, tokenPrefix } = {...defaultCreateCollectionParams, ...params};
+
await usingApi(async (api) => {
// Get number of collections before the transaction
const AcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString());
// Run the CreateCollection transaction
const alicePrivateKey = privateKey('//Alice');
- const tx = api.tx.nft.createCollection(name, description, tokenPrefix, mode);
- const events = await submitTransactionAsync(alicePrivateKey, tx);
+ const tx = api.tx.nft.createCollection(strToUTF16(name), strToUTF16(description), strToUTF16(tokenPrefix), mode);
+ const events = await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
const result = getCreateCollectionResult(events);
// Get number of collections after the transaction
@@ -168,11 +187,7 @@
// Run the DestroyCollection transaction
const alicePrivateKey = privateKey(senderSeed);
const tx = api.tx.nft.destroyCollection(collectionId);
- const events = await submitTransactionAsync(alicePrivateKey, tx);
- const result = getDestroyResult(events);
-
- // What to expect
- expect(result).to.be.false;
+ await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
});
}
@@ -238,11 +253,7 @@
// Run the transaction
const alicePrivateKey = privateKey('//Alice');
const tx = api.tx.nft.removeCollectionSponsor(collectionId);
- const events = await submitTransactionAsync(alicePrivateKey, tx);
- const result = getGenericResult(events);
-
- // What to expect
- expect(result.success).to.be.false;
+ await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
});
}
@@ -252,11 +263,7 @@
// Run the transaction
const alicePrivateKey = privateKey(senderSeed);
const tx = api.tx.nft.setCollectionSponsor(collectionId, sponsor);
- const events = await submitTransactionAsync(alicePrivateKey, tx);
- const result = getGenericResult(events);
-
- // What to expect
- expect(result.success).to.be.false;
+ await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
});
}
@@ -285,11 +292,7 @@
// Run the transaction
const sender = privateKey(senderSeed);
const tx = api.tx.nft.confirmSponsorship(collectionId);
- const events = await submitTransactionAsync(sender, tx);
- const result = getGenericResult(events);
-
- // What to expect
- expect(result.success).to.be.false;
+ await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
});
}