git.delta.rocks / unique-network / refs/commits / 1688ddabe82f

difftreelog

Merge branch 'develop' into feature/rft_arbitrary_fractions

Greg Zaitsev2021-02-09parents: #65c6481 #563ceaa.patch.diff
in: master

3 files changed

modifiedDockerfilediffbeforeafterboth
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 # ===== BUILD ======
 
-FROM phusion/baseimage:0.10.2 as builder
+FROM phusion/baseimage:18.04-1.0.0 as builder
 LABEL maintainer="gz@usetech.com"
 
-ENV WASM_TOOLCHAIN=nightly-2020-10-01
+ENV WASM_TOOLCHAIN=nightly-2021-01-27
 
 ARG PROFILE=release
 
@@ -37,7 +37,7 @@
 
 # ===== RUN ======
 
-FROM phusion/baseimage:0.10.2
+FROM phusion/baseimage:18.04-1.0.0
 ARG PROFILE=release
 
 COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin
modifiedtests/src/addCollectionAdmin.test.tsdiffbeforeafterboth
103 }); 103 });
104 }); 104 });
105 105
106 it('Add an admin to a collection that has reached the maximum number of admins limit', async () => { 106 it.only('Add an admin to a collection that has reached the maximum number of admins limit', async () => {
107 await usingApi(async (api: ApiPromise) => { 107 await usingApi(async (api: ApiPromise) => {
108 const Alice = privateKey('//Alice'); 108 const Alice = privateKey('//Alice');
109 const accounts = [ 109 const accounts = [
118 const collectionId = await createCollectionExpectSuccess(); 118 const collectionId = await createCollectionExpectSuccess();
119 119
120 const chainLimit = await api.query.nft.chainLimit() as unknown as { CollectionAdminsLimit: BN }; 120 const chainLimit = await api.query.nft.chainLimit() as unknown as { CollectionAdminsLimit: BN };
121 const chainLimitNumber = chainLimit.CollectionAdminsLimit.toNumber(); 121 const chainAdminLimit = chainLimit.CollectionAdminsLimit.toNumber();
122 expect(chainLimitNumber).to.be.equal(5); 122 expect(chainAdminLimit).to.be.equal(5);
123 123
124 for (let i = 0; i < chainLimitNumber; i++) { 124 for (let i = 0; i < chainAdminLimit; i++) {
125 const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, accounts[i]); 125 const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, accounts[i]);
126 await submitTransactionAsync(Alice, changeAdminTx); 126 await submitTransactionAsync(Alice, changeAdminTx);
127 const adminListAfterAddAdmin: any = (await api.query.nft.adminList(collectionId)); 127 const adminListAfterAddAdmin: any = (await api.query.nft.adminList(collectionId));
128 expect(adminListAfterAddAdmin).to.be.contains(accounts[i]); 128 expect(adminListAfterAddAdmin).to.be.contains(accounts[i]);
129 } 129 }
130 130
131 const tx = api.tx.nft.addCollectionAdmin(collectionId, accounts[chainLimitNumber]); 131 const tx = api.tx.nft.addCollectionAdmin(collectionId, accounts[chainAdminLimit]);
132 await expect(submitTransactionExpectFailAsync(Alice, tx)).to.be.rejected; 132 await expect(submitTransactionExpectFailAsync(Alice, tx)).to.be.rejected;
133 }); 133 });
134 }); 134 });
modifiedtests/src/transfer.test.tsdiffbeforeafterboth
--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -63,7 +63,7 @@
     });
   });
 
-  it('Create collection, balance transfers and check balance', async () => {
+  it('User can transfer owned token', async () => {
     await usingApi(async (api) => {
       const Alice = privateKey('//Alice');
       const Bob = privateKey('//Bob');