git.delta.rocks / unique-network / refs/commits / 0f16e4497b3b

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1132,7 +1132,7 @@
 		user: &T::CrossAccountId,
 		admin: bool,
 	) -> DispatchResult {
-		collection.check_is_owner_or_admin(sender)?;
+		collection.check_is_owner(sender)?;
 
 		let was_admin = <IsAdmin<T>>::get((collection.id, user));
 		if was_admin == admin {

17import {ApiPromise} from '@polkadot/api';17import {ApiPromise} from '@polkadot/api';
18import chai from 'chai';18import chai from 'chai';
19import chaiAsPromised from 'chai-as-promised';19import chaiAsPromised from 'chai-as-promised';
20import privateKey from './substrate/privateKey';
20import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';21import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';
21import {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';22import {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';
2223
41    });42    });
42  });43  });
43
44  it('Add admin using added collection admin.', async () => {
45    await usingApi(async (api, privateKeyWrapper) => {
46      const collectionId = await createCollectionExpectSuccess();
47      const alice = privateKeyWrapper('//Alice');
48      const bob = privateKeyWrapper('//Bob');
49      const charlie = privateKeyWrapper('//CHARLIE');
50
51      const collection = await queryCollectionExpectSuccess(api, collectionId);
52      expect(collection.owner.toString()).to.be.equal(alice.address);
53
54      const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
55      await submitTransactionAsync(alice, changeAdminTx);
56
57      const adminListAfterAddAdmin = await getAdminList(api, collectionId);
58      expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
59
60      const changeAdminTxCharlie = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(charlie.address));
61      await submitTransactionAsync(bob, changeAdminTxCharlie);
62      const adminListAfterAddNewAdmin = await getAdminList(api, collectionId);
63      expect(adminListAfterAddNewAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
64      expect(adminListAfterAddNewAdmin).to.be.deep.contains(normalizeAccountId(charlie.address));
65    });
66  });
67});44});
6845
69describe('Negative Integration Test addCollectionAdmin(collection_id, new_admin_id):', () => {46describe('Negative Integration Test addCollectionAdmin(collection_id, new_admin_id):', () => {
47  it("Not owner can't add collection admin.", async () => {
48    await usingApi(async (api) => {
49      const collectionId = await createCollectionExpectSuccess();
50      const alice = privateKey('//Alice');
51      const bob = privateKey('//Bob');
52      const charlie = privateKey('//CHARLIE');
53
54      const collection = await queryCollectionExpectSuccess(api, collectionId);
55      expect(collection.owner.toString()).to.be.equal(alice.address);
56
57      const adminListAfterAddAdmin = await getAdminList(api, collectionId);
58      expect(adminListAfterAddAdmin).to.be.not.deep.contains(normalizeAccountId(bob.address));
59
60      const changeAdminTxCharlie = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(charlie.address));
61      await expect(submitTransactionAsync(bob, changeAdminTxCharlie)).to.be.rejected;
62     
63      const adminListAfterAddNewAdmin = await getAdminList(api, collectionId);
64      expect(adminListAfterAddNewAdmin).to.be.not.deep.contains(normalizeAccountId(bob.address));
65      expect(adminListAfterAddNewAdmin).to.be.not.deep.contains(normalizeAccountId(charlie.address));
66    });
67  });
68
70  it("Not owner can't add collection admin.", async () => {69  it("Admin can't add collection admin.", async () => {
71    await usingApi(async (api, privateKeyWrapper) => {70    await usingApi(async (api) => {
72      const collectionId = await createCollectionExpectSuccess();71      const collectionId = await createCollectionExpectSuccess();
73      const alice = privateKeyWrapper('//Alice');72      const alice = privateKey('//Alice');
74      const nonOwner = privateKeyWrapper('//Bob_stash');73      const bob = privateKey('//Bob');
74      const charlie = privateKey('//CHARLIE');
75
76      const collection = await queryCollectionExpectSuccess(api, collectionId);
77      expect(collection.owner.toString()).to.be.equal(alice.address);
7578
76      const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(alice.address));79      const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
80      await submitTransactionAsync(alice, changeAdminTx);
81
82      const adminListAfterAddAdmin = await getAdminList(api, collectionId);
83      expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
84
85      const changeAdminTxCharlie = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(charlie.address));
77      await expect(submitTransactionExpectFailAsync(nonOwner, changeAdminTx)).to.be.rejected;86      await expect(submitTransactionAsync(bob, changeAdminTxCharlie)).to.be.rejected;
7887     
79      const adminListAfterAddAdmin = await getAdminList(api, collectionId);88      const adminListAfterAddNewAdmin = await getAdminList(api, collectionId);
80      expect(adminListAfterAddAdmin).not.to.be.deep.contains(normalizeAccountId(alice.address));89      expect(adminListAfterAddNewAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
81
82      // Verifying that nothing bad happened (network is live, new collections can be created, etc.)
83      await createCollectionExpectSuccess();90      expect(adminListAfterAddNewAdmin).to.be.not.deep.contains(normalizeAccountId(charlie.address));
84    });91    });
85  });92  });
93

--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -16,6 +16,7 @@
 
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
+import privateKey from './substrate/privateKey';
 import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';
 import {createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';
 
@@ -46,33 +47,6 @@
     });
   });
 
-  it('Remove collection admin by admin.', async () => {
-    await usingApi(async (api, privateKeyWrapper) => {
-      const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper('//Alice');
-      const bob = privateKeyWrapper('//Bob');
-      const charlie = privateKeyWrapper('//Charlie');
-      const collection = await queryCollectionExpectSuccess(api, collectionId);
-      expect(collection.owner.toString()).to.be.eq(alice.address);
-      // first - add collection admin Bob
-      const addAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
-      await submitTransactionAsync(alice, addAdminTx);
-
-      const addAdminTx2 = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(charlie.address));
-      await submitTransactionAsync(alice, addAdminTx2);
-
-      const adminListAfterAddAdmin = await getAdminList(api, collectionId);
-      expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
-
-      // then remove bob from admins of collection
-      const removeAdminTx = api.tx.unique.removeCollectionAdmin(collectionId, normalizeAccountId(bob.address));
-      await submitTransactionAsync(charlie, removeAdminTx);
-
-      const adminListAfterRemoveAdmin = await getAdminList(api, collectionId);
-      expect(adminListAfterRemoveAdmin).not.to.be.deep.contains(normalizeAccountId(bob.address));
-    });
-  });
-
   it('Remove admin from collection that has no admins', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const alice = privateKeyWrapper('//Alice');
@@ -120,12 +94,12 @@
     });
   });
 
-  it('Regular user Can\'t remove collection admin', async () => {
-    await usingApi(async (api, privateKeyWrapper) => {
+  it('Regular user can\'t remove collection admin', async () => {
+    await usingApi(async (api) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper('//Alice');
-      const bob = privateKeyWrapper('//Bob');
-      const charlie = privateKeyWrapper('//Charlie');
+      const alice = privateKey('//Alice');
+      const bob = privateKey('//Bob');
+      const charlie = privateKey('//Charlie');
 
       const addAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
       await submitTransactionAsync(alice, addAdminTx);
@@ -137,4 +111,23 @@
       await createCollectionExpectSuccess();
     });
   });
+
+  it('Admin can\'t remove collection admin.', async () => {
+    await usingApi(async (api) => {
+      const collectionId = await createCollectionExpectSuccess();
+      const alice = privateKey('//Alice');
+      const bob = privateKey('//Bob');
+      const charlie = privateKey('//Charlie');
+
+      const adminListAfterAddAdmin = await getAdminList(api, collectionId);
+      expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
+
+      const removeAdminTx = api.tx.unique.removeCollectionAdmin(collectionId, normalizeAccountId(bob.address));
+      await expect(submitTransactionAsync(charlie, removeAdminTx)).to.be.rejected;
+
+      const adminListAfterRemoveAdmin = await getAdminList(api, collectionId);
+      expect(adminListAfterRemoveAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
+      expect(adminListAfterRemoveAdmin).to.be.deep.contains(normalizeAccountId(charlie.address));
+    });
+  });
 });