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

--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -51,7 +51,7 @@
       .send();
     const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
 
-    const newAdmin = privateKey('//Alice');
+    const newAdmin = privateKeyWrapper('//Alice');
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     await collectionEvm.methods.addCollectionAdminSubstrate(newAdmin.addressRaw).send();
 
@@ -180,7 +180,7 @@
       .send();
     const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
 
-    const newAdmin = privateKey('//Alice');
+    const newAdmin = privateKeyWrapper('//Alice');
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     await collectionEvm.methods.addCollectionAdminSubstrate(newAdmin.addressRaw).send();
     {
@@ -255,7 +255,7 @@
       .send();
     const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
 
-    const adminSub = privateKey('//Alice');
+    const adminSub = privateKeyWrapper('//Alice');
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();
     const adminEth = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
@@ -280,7 +280,7 @@
       .send();
     const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
 
-    const adminSub = privateKey('//Alice');
+    const adminSub = privateKeyWrapper('//Alice');
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
     await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();
     const notAdminEth = await createEthAccountWithBalance(api, web3, privateKeyWrapper);

--- a/tests/src/nesting/graphs.test.ts
+++ b/tests/src/nesting/graphs.test.ts
@@ -13,7 +13,7 @@
  * ```
  */
 async function buildComplexObjectGraph(api: ApiPromise, sender: IKeyringPair): Promise<number> {
-  const events = await executeTransaction(api, sender, api.tx.unique.createCollectionEx({mode: 'NFT', permissions: {nesting: 'Owner'}}));
+  const events = await executeTransaction(api, sender, api.tx.unique.createCollectionEx({mode: 'NFT', permissions: {nesting: {tokenOwner: true}}}));
   const {collectionId} = getCreateCollectionResult(events);
 
   await executeTransaction(api, sender, api.tx.unique.createMultipleItemsEx(collectionId, {NFT: Array(8).fill({owner: {Substrate: sender.address}})}));

27    await usingApi(async api => {27    await usingApi(async api => {
28      const collection = await createCollectionExpectSuccess({mode: {type: 'Fungible',decimalPoints:0}});28      const collection = await createCollectionExpectSuccess({mode: {type: 'Fungible',decimalPoints:0}});
29      await expect(executeTransaction(api, alice, api.tx.unique.createItem(collection, nestTarget, {Fungible: {Value: 1}})))29      await expect(executeTransaction(api, alice, api.tx.unique.createItem(collection, nestTarget, {Fungible: {Value: 1}})))
30        .to.be.rejectedWith(/^common\.SourceCollectionIsNotAllowedToNest$/);30        .to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);
3131
32      await createFungibleItemExpectSuccess(alice, collection, {Value:1n}, {Substrate: alice.address});32      await createFungibleItemExpectSuccess(alice, collection, {Value:1n}, {Substrate: alice.address});
33      await expect(executeTransaction(api, alice, api.tx.unique.transfer(nestTarget, collection, 0, 1n)))33      await expect(executeTransaction(api, alice, api.tx.unique.transfer(nestTarget, collection, 0, 1n)))
34        .to.be.rejectedWith(/^common\.SourceCollectionIsNotAllowedToNest$/);34        .to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);
35    });35    });
36  });36  });
3737
38  it('called for nonfungible', async () => {38  it('called for nonfungible', async () => {
39    await usingApi(async api => {39    await usingApi(async api => {
40      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});40      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
41      await expect(executeTransaction(api, alice, api.tx.unique.createItem(collection, nestTarget, {NFT: {properties: []}})))41      await expect(executeTransaction(api, alice, api.tx.unique.createItem(collection, nestTarget, {NFT: {properties: []}})))
42        .to.be.rejectedWith(/^common\.SourceCollectionIsNotAllowedToNest$/);42        .to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);
4343
44      const token = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});44      const token = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
45      await expect(executeTransaction(api, alice, api.tx.unique.transfer(nestTarget, collection, token, 1n)))45      await expect(executeTransaction(api, alice, api.tx.unique.transfer(nestTarget, collection, token, 1n)))
46        .to.be.rejectedWith(/^common\.SourceCollectionIsNotAllowedToNest$/);46        .to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);
47    });47    });
48  });48  });
4949
50  it('called for refungible', async () => {50  it('called for refungible', async () => {
51    await usingApi(async api => {51    await usingApi(async api => {
52      const collection = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});52      const collection = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
53      await expect(executeTransaction(api, alice, api.tx.unique.createItem(collection, nestTarget, {ReFungible: {}})))53      await expect(executeTransaction(api, alice, api.tx.unique.createItem(collection, nestTarget, {ReFungible: {}})))
54        .to.be.rejectedWith(/^common\.SourceCollectionIsNotAllowedToNest$/);54        .to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);
5555
56      const token = await createItemExpectSuccess(alice, collection, 'ReFungible', {Substrate: alice.address});56      const token = await createItemExpectSuccess(alice, collection, 'ReFungible', {Substrate: alice.address});
57      await expect(executeTransaction(api, alice, api.tx.unique.transfer(nestTarget, collection, token, 1n)))57      await expect(executeTransaction(api, alice, api.tx.unique.transfer(nestTarget, collection, token, 1n)))
58        .to.be.rejectedWith(/^common\.SourceCollectionIsNotAllowedToNest$/);58        .to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);
59    });59    });
60  });60  });
61});61});