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

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';
21import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';20import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';
22import {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';21import {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';
2322
4544
46describe('Negative Integration Test addCollectionAdmin(collection_id, new_admin_id):', () => {45describe('Negative Integration Test addCollectionAdmin(collection_id, new_admin_id):', () => {
47  it("Not owner can't add collection admin.", async () => {46  it("Not owner can't add collection admin.", async () => {
48    await usingApi(async (api) => {47    await usingApi(async (api, privateKeyWrapper) => {
49      const collectionId = await createCollectionExpectSuccess();48      const collectionId = await createCollectionExpectSuccess();
50      const alice = privateKey('//Alice');49      const alice = privateKeyWrapper('//Alice');
51      const bob = privateKey('//Bob');50      const bob = privateKeyWrapper('//Bob');
52      const charlie = privateKey('//CHARLIE');51      const charlie = privateKeyWrapper('//CHARLIE');
5352
54      const collection = await queryCollectionExpectSuccess(api, collectionId);53      const collection = await queryCollectionExpectSuccess(api, collectionId);
55      expect(collection.owner.toString()).to.be.equal(alice.address);54      expect(collection.owner.toString()).to.be.equal(alice.address);
67  });66  });
6867
69  it("Admin can't add collection admin.", async () => {68  it("Admin can't add collection admin.", async () => {
70    await usingApi(async (api) => {69    await usingApi(async (api, privateKeyWrapper) => {
71      const collectionId = await createCollectionExpectSuccess();70      const collectionId = await createCollectionExpectSuccess();
72      const alice = privateKey('//Alice');71      const alice = privateKeyWrapper('//Alice');
73      const bob = privateKey('//Bob');72      const bob = privateKeyWrapper('//Bob');
74      const charlie = privateKey('//CHARLIE');73      const charlie = privateKeyWrapper('//CHARLIE');
7574
76      const collection = await queryCollectionExpectSuccess(api, collectionId);75      const collection = await queryCollectionExpectSuccess(api, collectionId);
77      expect(collection.owner.toString()).to.be.equal(alice.address);76      expect(collection.owner.toString()).to.be.equal(alice.address);

--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -16,7 +16,6 @@
 
 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';
 
@@ -95,11 +94,11 @@
   });
 
   it('Regular user can\'t remove collection admin', async () => {
-    await usingApi(async (api) => {
+    await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKey('//Alice');
-      const bob = privateKey('//Bob');
-      const charlie = privateKey('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const addAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
       await submitTransactionAsync(alice, addAdminTx);
@@ -113,11 +112,11 @@
   });
 
   it('Admin can\'t remove collection admin.', async () => {
-    await usingApi(async (api) => {
+    await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKey('//Alice');
-      const bob = privateKey('//Bob');
-      const charlie = privateKey('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const adminListAfterAddAdmin = await getAdminList(api, collectionId);
       expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(bob.address));

--- a/tests/src/scheduler.test.ts
+++ b/tests/src/scheduler.test.ts
@@ -16,7 +16,6 @@
 
 import chai, {expect} from 'chai';
 import chaiAsPromised from 'chai-as-promised';
-import privateKey from './substrate/privateKey';
 import {
   default as usingApi, 
   submitTransactionAsync,