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

38      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');38      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
39      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);39      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
40
41      // garbage collection :-D
42      await destroyCollectionExpectSuccess(nftCollectionId);
43      await destroyCollectionExpectSuccess(fungibleCollectionId);
44      await destroyCollectionExpectSuccess(reFungibleCollectionId);
45    });40    });
46  });41  });
4742
66      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 1);61      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 1);
67      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 0);62      await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 0);
68
69      // garbage collection :-D
70      await destroyCollectionExpectSuccess(nftCollectionId);
71      await destroyCollectionExpectSuccess(fungibleCollectionId);
72      await destroyCollectionExpectSuccess(reFungibleCollectionId);
73    });63    });
74  });64  });
75});65});
80      const Alice = privateKey('//Alice');70      const Alice = privateKey('//Alice');
81      const Bob = privateKey('//Bob');71      const Bob = privateKey('//Bob');
82      // nft72      // nft
83      const nftCollectionId = await createCollectionExpectSuccess();73      const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
84      await approveExpectFail(nftCollectionId + 1, 1, Alice, Bob);74      await approveExpectFail(nftCollectionCount + 1, 1, Alice, Bob);
85      // fungible75      // fungible
86      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});76      const fungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
87      await approveExpectFail(fungibleCollectionId + 1, 1, Alice, Bob);77      await approveExpectFail(fungibleCollectionCount + 1, 1, Alice, Bob);
88      // reFungible78      // reFungible
89      const reFungibleCollectionId =79      const reFungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
90        await createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
91      await approveExpectFail(reFungibleCollectionId + 1, 1, Alice, Bob);80      await approveExpectFail(reFungibleCollectionCount + 1, 1, Alice, Bob);
92      // garbage collection :-D
93      await destroyCollectionExpectSuccess(nftCollectionId);
94      await destroyCollectionExpectSuccess(fungibleCollectionId);
95      await destroyCollectionExpectSuccess(reFungibleCollectionId);
96    });81    });
97  });82  });
9883
130      const reFungibleCollectionId =115      const reFungibleCollectionId =
131        await createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});116        await createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
132      await approveExpectFail(reFungibleCollectionId, 2, Alice, Bob);117      await approveExpectFail(reFungibleCollectionId, 2, Alice, Bob);
133      // garbage collection :-D
134      await destroyCollectionExpectSuccess(nftCollectionId);
135      await destroyCollectionExpectSuccess(fungibleCollectionId);
136      await destroyCollectionExpectSuccess(reFungibleCollectionId);
137    });118    });
138  });119  });
139120
155      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');136      const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
156      await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice);137      await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice);
157
158      // garbage collection :-D
159      await destroyCollectionExpectSuccess(nftCollectionId);
160      await destroyCollectionExpectSuccess(fungibleCollectionId);
161      await destroyCollectionExpectSuccess(reFungibleCollectionId);
162    });138    });
163  });139  });
164});140});

--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -45,11 +45,6 @@
       await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
       await transferFromExpectSuccess(reFungibleCollectionId,
         newReFungibleTokenId, Bob, Alice, Charlie, 1, 'ReFungible');
-
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 });
@@ -61,27 +56,21 @@
       const Bob = privateKey('//Bob');
       const Charlie = privateKey('//CHARLIE');
       // nft
-      const nftCollectionId = await createCollectionExpectSuccess();
-      await approveExpectFail(nftCollectionId + 1, 1, Alice, Bob);
+      const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
+      await approveExpectFail(nftCollectionCount + 1, 1, Alice, Bob);
 
-      await transferFromExpectFail(nftCollectionId + 1, 1, Bob, Alice, Charlie, 1);
+      await transferFromExpectFail(nftCollectionCount + 1, 1, Bob, Alice, Charlie, 1);
 
       // fungible
-      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
-      await approveExpectFail(fungibleCollectionId + 1, 1, Alice, Bob);
+      const fungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
+      await approveExpectFail(fungibleCollectionCount + 1, 1, Alice, Bob);
 
-      await transferFromExpectFail(fungibleCollectionId + 1, 1, Bob, Alice, Charlie, 1);
+      await transferFromExpectFail(fungibleCollectionCount + 1, 1, Bob, Alice, Charlie, 1);
       // reFungible
-      const reFungibleCollectionId = await
-        createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
-      await approveExpectFail(reFungibleCollectionId + 1, 1, Alice, Bob);
-
-      await transferFromExpectFail(reFungibleCollectionId + 1, 1, Bob, Alice, Charlie, 1);
+      const reFungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
+      await approveExpectFail(reFungibleCollectionCount + 1, 1, Alice, Bob);
 
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
+      await transferFromExpectFail(reFungibleCollectionCount + 1, 1, Bob, Alice, Charlie, 1);
     });
   });
 
@@ -124,11 +113,6 @@
       const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
       await transferFromExpectFail(reFungibleCollectionId,
         newReFungibleTokenId, Bob, Alice, Charlie, 1);
-
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 
@@ -156,11 +140,6 @@
       await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
       await transferFromExpectFail(reFungibleCollectionId,
         newReFungibleTokenId, Bob, Alice, Charlie, 2);
-
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 
@@ -204,10 +183,6 @@
         // tslint:disable-next-line:no-unused-expression
         expect(e).to.be.exist;
       }
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 });