git.delta.rocks / unique-network / refs/commits / 7f526e168d3e

difftreelog

Merge develop and remove unneeded usingApi

Greg Zaitsev2021-02-11parent: #1d6108d.patch.diff
in: master
(cherry picked from commit 0ccf6006f00210f190eb9d8393d86a6f68778bae)

6 files changed

modifiedtests/src/approve.test.tsdiffbeforeafterboth
--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -12,8 +12,11 @@
   approveExpectFail,
   approveExpectSuccess,
   createCollectionExpectSuccess,
+  createFungibleItemExpectSuccess,
   createItemExpectSuccess,
   destroyCollectionExpectSuccess,
+  transferFromExpectSuccess,
+  U128_MAX,
 } from './util/helpers';
 
 chai.use(chaiAsPromised);
modifiedtests/src/overflow.test.tsdiffbeforeafterboth
--- a/tests/src/overflow.test.ts
+++ b/tests/src/overflow.test.ts
@@ -1,3 +1,8 @@
+//
+// This file is subject to the terms and conditions defined in
+// file 'LICENSE', which is part of this source code package.
+//
+
 import { IKeyringPair } from "@polkadot/types/types";
 import chai from 'chai';
 import chaiAsPromised from "chai-as-promised";
@@ -22,47 +27,41 @@
     });
 
     it('fails when overflows on transfer', async () => {
-        await usingApi(async () => {
-            const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
+        const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await transferExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX, 'Fungible');
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await transferExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX, 'Fungible');
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: 1n });
-            await transferExpectFail(fungibleCollectionId, 0, alice, bob, 1, 'Fungible');
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: 1n });
+        await transferExpectFail(fungibleCollectionId, 0, alice, bob, 1, 'Fungible');
 
-            expect(await getFungibleBalance(fungibleCollectionId, alice.address)).to.equal(1n);
-            expect(await getFungibleBalance(fungibleCollectionId, bob.address)).to.equal(U128_MAX);
-        });
+        expect(await getFungibleBalance(fungibleCollectionId, alice.address)).to.equal(1n);
+        expect(await getFungibleBalance(fungibleCollectionId, bob.address)).to.equal(U128_MAX);
     });
 
     it('fails on allowance overflow', async () => {
-        await usingApi(async () => {
-            const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
+        const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
-            await approveExpectFail(fungibleCollectionId, 0, alice, bob, U128_MAX);
-        });
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
+        await approveExpectFail(fungibleCollectionId, 0, alice, bob, U128_MAX);
     });
 
     it('fails when overflows on transferFrom', async () => {
-        await usingApi(async () => {
-            const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
+        const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
-            await transferFromExpectSuccess(fungibleCollectionId, 0, bob, alice, charlie, U128_MAX, 'Fungible');
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
+        await transferFromExpectSuccess(fungibleCollectionId, 0, bob, alice, charlie, U128_MAX, 'Fungible');
 
-            expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
-            expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
+        expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
+        expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, 1n);
-            await transferFromExpectFail(fungibleCollectionId, 0, bob, alice, charlie, 1);
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, 1n);
+        await transferFromExpectFail(fungibleCollectionId, 0, bob, alice, charlie, 1);
 
-            expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
-            expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
-        });
+        expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
+        expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
     });
 });
modifiedtests/src/removeFromContractWhiteList.test.tsdiffbeforeafterboth
--- a/tests/src/removeFromContractWhiteList.test.ts
+++ b/tests/src/removeFromContractWhiteList.test.ts
@@ -1,3 +1,8 @@
+//
+// This file is subject to the terms and conditions defined in
+// file 'LICENSE', which is part of this source code package.
+//
+
 import privateKey from "./substrate/privateKey";
 import usingApi from "./substrate/substrate-api";
 import { deployFlipper, toggleFlipValueExpectFailure, toggleFlipValueExpectSuccess } from "./util/contracthelpers";
modifiedtests/src/transferFrom.test.tsdiffbeforeafterboth
--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -11,8 +11,10 @@
   approveExpectFail,
   approveExpectSuccess,
   createCollectionExpectSuccess,
+  createFungibleItemExpectSuccess,
   createItemExpectSuccess,
   destroyCollectionExpectSuccess,
+  getAllowance,
   transferFromExpectFail,
   transferFromExpectSuccess,
   burnItemExpectSuccess,
@@ -48,6 +50,22 @@
         newReFungibleTokenId, Bob, Alice, Charlie, 100, 'ReFungible');
     });
   });
+
+  it('Should reduce allowance if value is big', async () => {
+    await usingApi(async () => {
+      const alice = privateKey('//Alice');
+      const bob = privateKey('//Bob');
+      const charlie = privateKey('//Charlie');
+
+      // fungible
+      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
+      const newFungibleTokenId = await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: 500000n });
+
+      await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob, 500000n);
+      await transferFromExpectSuccess(fungibleCollectionId, newFungibleTokenId, bob, alice, charlie, 500000n, 'Fungible');
+      expect((await getAllowance(fungibleCollectionId, newFungibleTokenId, alice.address, bob.address)).toString()).to.equal('0');
+    });
+  });
 });
 
 describe('Negative Integration Test transferFrom(from, recipient, collection_id, item_id, value):', () => {
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
247  });247  });
248}248}
249
250export function findUnusedAddresses(api: ApiPromise, amount: number): Promise<IKeyringPair[]> {
251  return Promise.all(new Array(amount).fill(null).map(() => findUnusedAddress(api, '_' + Date.now())));
252}
249253
250export async function findNotExistingCollection(api: ApiPromise): Promise<number> {254export async function findNotExistingCollection(api: ApiPromise): Promise<number> {
251  const totalNumber = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10) as unknown as number;255  const totalNumber = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10) as unknown as number;
517521
518export async function522export async function
519approveExpectSuccess(collectionId: number,523approveExpectSuccess(collectionId: number,
520                     tokenId: number, owner: IKeyringPair, approved: IKeyringPair, amount: number | bigint = 1) { //alice,bob524                     tokenId: number, owner: IKeyringPair, approved: IKeyringPair, amount: number | bigint = 1) {
521  await usingApi(async (api: ApiPromise) => {525  await usingApi(async (api: ApiPromise) => {
522    const allowanceBefore =526    const allowanceBefore =
523      await api.query.nft.allowances(collectionId, [tokenId, owner.address, approved.address]) as unknown as BN;527      await api.query.nft.allowances(collectionId, [tokenId, owner.address, approved.address]) as unknown as BN;
535export async function539export async function
536transferFromExpectSuccess(collectionId: number,540transferFromExpectSuccess(collectionId: number,
537                          tokenId: number,541                          tokenId: number,
538                          accountApproved: IKeyringPair, //bob542                          accountApproved: IKeyringPair,
539                          accountFrom: IKeyringPair, //alice543                          accountFrom: IKeyringPair,
540                          accountTo: IKeyringPair, //charlie544                          accountTo: IKeyringPair,
541                          value: number | bigint = 1,545                          value: number | bigint = 1,
542                          type: string = 'NFT') {546                          type: string = 'NFT') {
543  await usingApi(async (api: ApiPromise) => {547  await usingApi(async (api: ApiPromise) => {
modifiedtests/yarn.lockdiffbeforeafterboth
--- a/tests/yarn.lock
+++ b/tests/yarn.lock
@@ -4638,7 +4638,7 @@
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.1.0:
+is-core-module@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
   integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
@@ -7027,11 +7027,11 @@
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.3.2:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
-    is-core-module "^2.1.0"
+    is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
 responselike@^1.0.2: