git.delta.rocks / unique-network / refs/commits / 59f80a7ca362

difftreelog

fix test after burtItem redesign (partially)

Igor Kozyrev2021-10-08parent: #35ede41.patch.diff
in: master

7 files changed

modifiedtests/src/burnItem.test.tsdiffbeforeafterboth
--- a/tests/src/burnItem.test.ts
+++ b/tests/src/burnItem.test.ts
@@ -38,7 +38,7 @@
     const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
 
     await usingApi(async (api) => {
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);
       const events = await submitTransactionAsync(alice, tx);
       const result = getGenericResult(events);
       // Get the item
@@ -59,7 +59,7 @@
 
     await usingApi(async (api) => {
       // Destroy 1 of 10
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 1);
       const events = await submitTransactionAsync(alice, tx);
       const result = getGenericResult(events);
   
@@ -79,7 +79,7 @@
     const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
 
     await usingApi(async (api) => {
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 1);
       const events = await submitTransactionAsync(alice, tx);
       const result = getGenericResult(events);
   
@@ -92,7 +92,7 @@
     });
   });
 
-  it('Burn owned portion of item in ReFungible collection', async () => {
+  it.only('Burn owned portion of item in ReFungible collection', async () => {
     const createMode = 'ReFungible';
     const collectionId = await createCollectionExpectSuccess({mode: {type: createMode}});
     const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
@@ -107,7 +107,7 @@
       const balanceBefore: any = (await api.query.nft.reFungibleItemList(collectionId, tokenId)).toJSON();
 
       // Bob burns his portion
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(bob.address), 0);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);
       const events2 = await submitTransactionAsync(bob, tx);
       const result2 = getGenericResult(events2);
 
@@ -152,7 +152,7 @@
     await addCollectionAdminExpectSuccess(alice, collectionId, bob);
 
     await usingApi(async (api) => {
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);
       const events = await submitTransactionAsync(bob, tx);
       const result = getGenericResult(events);
       // Get the item
@@ -166,7 +166,7 @@
   });
 
 
-  it('Burn item in Fungible collection', async () => {
+  it.only('Burn item in Fungible collection', async () => {
     const createMode = 'Fungible';
     const collectionId = await createCollectionExpectSuccess({mode: {type: createMode, decimalPoints: 0 }});
     await createItemExpectSuccess(alice, collectionId, createMode); // Helper creates 10 fungible tokens
@@ -175,7 +175,7 @@
 
     await usingApi(async (api) => {
       // Destroy 1 of 10
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 1);
       const events = await submitTransactionAsync(bob, tx);
       const result = getGenericResult(events);
   
@@ -189,14 +189,14 @@
     });
   });
   
-  it('Burn item in ReFungible collection', async () => {
+  it.only('Burn item in ReFungible collection', async () => {
     const createMode = 'ReFungible';
     const collectionId = await createCollectionExpectSuccess({mode: {type: createMode }});
     const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
     await addCollectionAdminExpectSuccess(alice, collectionId, bob);
 
     await usingApi(async (api) => {
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 1);
       const events = await submitTransactionAsync(bob, tx);
       const result = getGenericResult(events);
       // Get alice balance 
@@ -225,7 +225,7 @@
     await destroyCollectionExpectSuccess(collectionId);
 
     await usingApi(async (api) => {
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);
       const badTransaction = async function () { 
         await submitTransactionExpectFailAsync(alice, tx);
       };
@@ -240,7 +240,7 @@
     const tokenId = 10;
 
     await usingApi(async (api) => {
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);
       const badTransaction = async function () { 
         await submitTransactionExpectFailAsync(alice, tx);
       };
@@ -255,7 +255,7 @@
     const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
 
     await usingApi(async (api) => {
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);
       const badTransaction = async function () { 
         await submitTransactionExpectFailAsync(bob, tx);
       };
@@ -271,7 +271,7 @@
 
     await usingApi(async (api) => {
 
-      const burntx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
+      const burntx = api.tx.nft.burnItem(collectionId, tokenId, 0);
       const events1 = await submitTransactionAsync(alice, burntx);
       const result1 = getGenericResult(events1);
       expect(result1.success).to.be.true;
@@ -294,7 +294,7 @@
 
     await usingApi(async (api) => {
       // Destroy 11 of 10
-      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 11);
+      const tx = api.tx.nft.burnItem(collectionId, tokenId, 11);
       const badTransaction = async function () { 
         await submitTransactionExpectFailAsync(alice, tx);
       };
modifiedtests/src/check-event/burnItemEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/burnItemEvent.test.ts
+++ b/tests/src/check-event/burnItemEvent.test.ts
@@ -29,7 +29,7 @@
     await usingApi(async (api: ApiPromise) => {
       const collectionID = await createCollectionExpectSuccess();
       const itemID = await createItemExpectSuccess(Alice, collectionID, 'NFT');
-      const burnItem = api.tx.nft.burnItem(collectionID, itemID, normalizeAccountId(Alice.address), 1);
+      const burnItem = api.tx.nft.burnItem(collectionID, itemID, 1);
       const events = await submitTransactionAsync(Alice, burnItem);
       const msg = JSON.stringify(nftEventMessage(events));
       expect(msg).to.be.contain(checkSection);
modifiedtests/src/collision-tests/admVsOwnerTake.test.tsdiffbeforeafterboth
--- a/tests/src/collision-tests/admVsOwnerTake.test.ts
+++ b/tests/src/collision-tests/admVsOwnerTake.test.ts
@@ -34,7 +34,7 @@
       const itemId = await createItemExpectSuccess(Bob, collectionId, 'NFT');
       //
       const sendItem = api.tx.nft.transfer(normalizeAccountId(Ferdie.address), collectionId, itemId, 1);
-      const burnItem = api.tx.nft.burnItem(collectionId, itemId, normalizeAccountId(Alice.address), 1);
+      const burnItem = api.tx.nft.burnItem(collectionId, itemId, 1);
       await Promise.all([
         sendItem.signAndSend(Bob),
         burnItem.signAndSend(Alice),
modifiedtests/src/setVariableMetaData.test.tsdiffbeforeafterboth
--- a/tests/src/setVariableMetaData.test.ts
+++ b/tests/src/setVariableMetaData.test.ts
@@ -116,7 +116,7 @@
   it('fails on removed token', async () => {
     const removedTokenCollectionId = await createCollectionExpectSuccess({ mode: { type: 'NFT' } });
     const removedTokenId = await createItemExpectSuccess(alice, removedTokenCollectionId, 'NFT');
-    await burnItemExpectSuccess(alice, removedTokenCollectionId, removedTokenId, alice);
+    await burnItemExpectSuccess(alice, removedTokenCollectionId, removedTokenId);
 
     await setVariableMetaDataExpectFailure(alice, removedTokenCollectionId, removedTokenId, data);
   });
modifiedtests/src/transfer.test.tsdiffbeforeafterboth
--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -184,22 +184,22 @@
       1,
     );
   });
-  it('Transfer with deleted item_id', async () => {
+  it.only('Transfer with deleted item_id', async () => {
     // nft
     const nftCollectionId = await createCollectionExpectSuccess();
     const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
-    await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, Alice, 1);
+    await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);
     await transferExpectFailure(nftCollectionId, newNftTokenId, Alice, Bob, 1);
     // fungible
     const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
     const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
-    await burnItemExpectSuccess(Alice, fungibleCollectionId, newFungibleTokenId, Alice, 10);
+    await burnItemExpectSuccess(Alice, fungibleCollectionId, newFungibleTokenId, 10);
     await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1);
     // reFungible
     const reFungibleCollectionId = await
     createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
     const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
-    await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, Alice, 1);
+    await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);
     await transferExpectFailure(
       reFungibleCollectionId,
       newReFungibleTokenId,
modifiedtests/src/transferFrom.test.tsdiffbeforeafterboth
246      // nft246      // nft
247      const nftCollectionId = await createCollectionExpectSuccess();247      const nftCollectionId = await createCollectionExpectSuccess();
248      const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');248      const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
249      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, Alice, 1);249      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);
250      await approveExpectFail(nftCollectionId, newNftTokenId, Alice, Bob);250      await approveExpectFail(nftCollectionId, newNftTokenId, Alice, Bob);
251      await transferFromExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, Charlie, 1);      251      await transferFromExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, Charlie, 1);      
252    });252    });
253  });253  });
254  it( 'transferFrom burnt token before approve Fungible', async () => {254  it.only( 'transferFrom burnt token before approve Fungible', async () => {
255    await usingApi(async () => {255    await usingApi(async () => {
256      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});256      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
257      const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');257      const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
258      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, Alice, 10);258      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, 10);
259      await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);259      await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);
260      await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, Bob, Alice, Charlie, 1);260      await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, Bob, Alice, Charlie, 1);
261          261          
265    await usingApi(async () => {265    await usingApi(async () => {
266      const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});266      const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
267      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');267      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
268      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, Alice, 1);268      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);
269      await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);269      await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
270      await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice, Charlie, 1);270      await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice, Charlie, 1);
271          271          
272    });272    });
273  });273  });
274  274  
275  it( 'transferFrom burnt token after approve NFT', async () => {275  it.only( 'transferFrom burnt token after approve NFT', async () => {
276    await usingApi(async () => {276    await usingApi(async () => {
277      // nft277      // nft
278      const nftCollectionId = await createCollectionExpectSuccess();278      const nftCollectionId = await createCollectionExpectSuccess();
279      const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');279      const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
280      await approveExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob);280      await approveExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob);
281      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, Alice, 1);281      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);
282      await transferFromExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, Charlie, 1);      282      await transferFromExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, Charlie, 1);      
283    });283    });
284  });284  });
285  it( 'transferFrom burnt token after approve Fungible', async () => {285  it.only( 'transferFrom burnt token after approve Fungible', async () => {
286    await usingApi(async () => {286    await usingApi(async () => {
287      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});287      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
288      const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');288      const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
289      await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);289      await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);
290      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, Alice, 10);290      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, 10);
291      await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, Bob, Alice, Charlie, 1);291      await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, Bob, Alice, Charlie, 1);
292          292          
293    });293    });
294  }); 294  }); 
295  it( 'transferFrom burnt token after approve ReFungible', async () => {295  it.only( 'transferFrom burnt token after approve ReFungible', async () => {
296    await usingApi(async () => {296    await usingApi(async () => {
297      const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});297      const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
298      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');298      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
299      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);299      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
300      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, Alice, 1);300      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);
301      await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice, Charlie, 1);301      await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice, Charlie, 1);
302          302          
303    });303    });
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -700,9 +700,9 @@
   ReFungible: CreateReFungibleData;
 };
 
-export async function burnItemExpectSuccess(sender: IKeyringPair, collectionId: number, tokenId: number, owner: IKeyringPair, value = 0) {
+export async function burnItemExpectSuccess(sender: IKeyringPair, collectionId: number, tokenId: number, value = 0) {
   await usingApi(async (api) => {
-    const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(owner.address), value);
+    const tx = api.tx.nft.burnItem(collectionId, tokenId, value);
     const events = await submitTransactionAsync(sender, tx);
     const result = getGenericResult(events);
     // Get the item