git.delta.rocks / unique-network / refs/commits / e6241c65a99f

difftreelog

Merge pull request #96 from usetech-llc/feature/NFTPAR-306_treasury_update

str-mv2021-02-10parents: #4fc0eb5 #2526db2.patch.diff
in: master
Update treasury pallet

3 files changed

modifiedCargo.lockdiffbeforeafterboth
before · Cargo.lock
704 packageslockfile v1
after · Cargo.lock
704 packageslockfile v1
modifiedtests/src/addCollectionAdmin.test.tsdiffbeforeafterboth
--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -103,7 +103,7 @@
     });
   });
 
-  it.only('Add an admin to a collection that has reached the maximum number of admins limit', async () => {
+  it('Add an admin to a collection that has reached the maximum number of admins limit', async () => {
     await usingApi(async (api: ApiPromise) => {
       const Alice = privateKey('//Alice');
       const accounts = [
modifiedtests/src/creditFeesToTreasury.test.tsdiffbeforeafterboth
--- a/tests/src/creditFeesToTreasury.test.ts
+++ b/tests/src/creditFeesToTreasury.test.ts
@@ -17,6 +17,8 @@
   transferExpectSuccess
 } from './util/helpers';
 
+import { default as waitNewBlocks } from './substrate/wait-new-blocks';
+
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 
@@ -37,6 +39,8 @@
 
   it('Total issuance does not change', async () => {
     await usingApi(async (api) => {
+      await waitNewBlocks(api, 1);
+
       const totalBefore = new BigNumber((await api.query.balances.totalIssuance()).toString());
 
       const alicePrivateKey = privateKey('//Alice');
@@ -54,6 +58,8 @@
 
   it('Sender balance decreased by fee+sent amount, Treasury balance increased by fee', async () => {
     await usingApi(async (api) => {
+      await waitNewBlocks(api, 1);
+
       const alicePrivateKey = privateKey('//Alice');
       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());
@@ -74,6 +80,8 @@
 
   it('Treasury balance increased by failed tx fee', async () => {
     await usingApi(async (api) => {
+      await waitNewBlocks(api, 1);
+
       const bobPrivateKey = privateKey('//Bob');
       const treasuryBalanceBefore = new BigNumber((await api.query.system.account(Treasury)).data.free.toString());
       const bobBalanceBefore = new BigNumber((await api.query.system.account(bobsPublicKey)).data.free.toString());
@@ -92,6 +100,8 @@
 
   it('NFT Transactions also send fees to Treasury', async () => {
     await usingApi(async (api) => {
+      await waitNewBlocks(api, 1);
+
       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());
 
@@ -108,15 +118,12 @@
 
   it('Fees are sane', async () => {
     await usingApi(async (api) => {
-      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();
 
-      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());
       const fee = aliceBalanceBefore.minus(aliceBalanceAfter);
-      const treasuryIncrease = treasuryBalanceAfter.minus(treasuryBalanceBefore);
 
       expect(fee.dividedBy(1e15).toNumber()).to.be.lessThan(saneMaximumFee);
       expect(fee.dividedBy(1e15).toNumber()).to.be.greaterThan(saneMinimumFee);