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

--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -37,11 +37,6 @@
         await createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
       const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
       await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
-
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 
@@ -65,11 +60,6 @@
       const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
       await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 1);
       await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 0);
-
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 });
@@ -80,19 +70,14 @@
       const Alice = privateKey('//Alice');
       const Bob = privateKey('//Bob');
       // 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);
       // 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);
       // reFungible
-      const reFungibleCollectionId =
-        await createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
-      await approveExpectFail(reFungibleCollectionId + 1, 1, Alice, Bob);
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
+      const reFungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
+      await approveExpectFail(reFungibleCollectionCount + 1, 1, Alice, Bob);
     });
   });
 
@@ -130,10 +115,6 @@
       const reFungibleCollectionId =
         await createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
       await approveExpectFail(reFungibleCollectionId, 2, Alice, Bob);
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 
@@ -154,11 +135,6 @@
         await createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
       const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
       await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice);
-
-      // garbage collection :-D
-      await destroyCollectionExpectSuccess(nftCollectionId);
-      await destroyCollectionExpectSuccess(fungibleCollectionId);
-      await destroyCollectionExpectSuccess(reFungibleCollectionId);
     });
   });
 });

46      await transferFromExpectSuccess(reFungibleCollectionId,46      await transferFromExpectSuccess(reFungibleCollectionId,
47        newReFungibleTokenId, Bob, Alice, Charlie, 1, 'ReFungible');47        newReFungibleTokenId, Bob, Alice, Charlie, 1, 'ReFungible');
48
49      // garbage collection :-D
50      await destroyCollectionExpectSuccess(nftCollectionId);
51      await destroyCollectionExpectSuccess(fungibleCollectionId);
52      await destroyCollectionExpectSuccess(reFungibleCollectionId);
53    });48    });
54  });49  });
55});50});
61      const Bob = privateKey('//Bob');56      const Bob = privateKey('//Bob');
62      const Charlie = privateKey('//CHARLIE');57      const Charlie = privateKey('//CHARLIE');
63      // nft58      // nft
64      const nftCollectionId = await createCollectionExpectSuccess();59      const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
65      await approveExpectFail(nftCollectionId + 1, 1, Alice, Bob);60      await approveExpectFail(nftCollectionCount + 1, 1, Alice, Bob);
6661
67      await transferFromExpectFail(nftCollectionId + 1, 1, Bob, Alice, Charlie, 1);62      await transferFromExpectFail(nftCollectionCount + 1, 1, Bob, Alice, Charlie, 1);
6863
69      // fungible64      // fungible
70      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});65      const fungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
71      await approveExpectFail(fungibleCollectionId + 1, 1, Alice, Bob);66      await approveExpectFail(fungibleCollectionCount + 1, 1, Alice, Bob);
7267
73      await transferFromExpectFail(fungibleCollectionId + 1, 1, Bob, Alice, Charlie, 1);68      await transferFromExpectFail(fungibleCollectionCount + 1, 1, Bob, Alice, Charlie, 1);
74      // reFungible69      // reFungible
75      const reFungibleCollectionId = await70      const reFungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
76        createCollectionExpectSuccess({mode: {type: 'ReFungible', decimalPoints: 0}});
77      await approveExpectFail(reFungibleCollectionId + 1, 1, Alice, Bob);71      await approveExpectFail(reFungibleCollectionCount + 1, 1, Alice, Bob);
7872
79      await transferFromExpectFail(reFungibleCollectionId + 1, 1, Bob, Alice, Charlie, 1);73      await transferFromExpectFail(reFungibleCollectionCount + 1, 1, Bob, Alice, Charlie, 1);
80
81      // garbage collection :-D
82      await destroyCollectionExpectSuccess(nftCollectionId);
83      await destroyCollectionExpectSuccess(fungibleCollectionId);
84      await destroyCollectionExpectSuccess(reFungibleCollectionId);
85    });74    });
86  });75  });
8776
125      await transferFromExpectFail(reFungibleCollectionId,114      await transferFromExpectFail(reFungibleCollectionId,
126        newReFungibleTokenId, Bob, Alice, Charlie, 1);115        newReFungibleTokenId, Bob, Alice, Charlie, 1);
127
128      // garbage collection :-D
129      await destroyCollectionExpectSuccess(nftCollectionId);
130      await destroyCollectionExpectSuccess(fungibleCollectionId);
131      await destroyCollectionExpectSuccess(reFungibleCollectionId);
132    });116    });
133  });117  });
134118
157      await transferFromExpectFail(reFungibleCollectionId,141      await transferFromExpectFail(reFungibleCollectionId,
158        newReFungibleTokenId, Bob, Alice, Charlie, 2);142        newReFungibleTokenId, Bob, Alice, Charlie, 2);
159
160      // garbage collection :-D
161      await destroyCollectionExpectSuccess(nftCollectionId);
162      await destroyCollectionExpectSuccess(fungibleCollectionId);
163      await destroyCollectionExpectSuccess(reFungibleCollectionId);
164    });143    });
165  });144  });
166145
204        // tslint:disable-next-line:no-unused-expression183        // tslint:disable-next-line:no-unused-expression
205        expect(e).to.be.exist;184        expect(e).to.be.exist;
206      }185      }
207      // garbage collection :-D
208      await destroyCollectionExpectSuccess(nftCollectionId);
209      await destroyCollectionExpectSuccess(fungibleCollectionId);
210      await destroyCollectionExpectSuccess(reFungibleCollectionId);
211    });186    });
212  });187  });
213});188});