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

--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -17,7 +17,6 @@
 import {ApiPromise} from '@polkadot/api';
 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 {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';
 
@@ -45,11 +44,11 @@
 
 describe('Negative Integration Test addCollectionAdmin(collection_id, new_admin_id):', () => {
   it("Not owner can't add 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 collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.equal(alice.address);
@@ -67,11 +66,11 @@
   });
 
   it("Admin can't add 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 collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.equal(alice.address);

1616
17import chai from 'chai';17import chai from 'chai';
18import chaiAsPromised from 'chai-as-promised';18import chaiAsPromised from 'chai-as-promised';
19import privateKey from './substrate/privateKey';
20import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';19import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';
21import {createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';20import {createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';
2221
95  });94  });
9695
97  it('Regular user can\'t remove collection admin', async () => {96  it('Regular user can\'t remove collection admin', async () => {
98    await usingApi(async (api) => {97    await usingApi(async (api, privateKeyWrapper) => {
99      const collectionId = await createCollectionExpectSuccess();98      const collectionId = await createCollectionExpectSuccess();
100      const alice = privateKey('//Alice');99      const alice = privateKeyWrapper('//Alice');
101      const bob = privateKey('//Bob');100      const bob = privateKeyWrapper('//Bob');
102      const charlie = privateKey('//Charlie');101      const charlie = privateKeyWrapper('//Charlie');
103102
104      const addAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));103      const addAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
105      await submitTransactionAsync(alice, addAdminTx);104      await submitTransactionAsync(alice, addAdminTx);
113  });112  });
114113
115  it('Admin can\'t remove collection admin.', async () => {114  it('Admin can\'t remove collection admin.', async () => {
116    await usingApi(async (api) => {115    await usingApi(async (api, privateKeyWrapper) => {
117      const collectionId = await createCollectionExpectSuccess();116      const collectionId = await createCollectionExpectSuccess();
118      const alice = privateKey('//Alice');117      const alice = privateKeyWrapper('//Alice');
119      const bob = privateKey('//Bob');118      const bob = privateKeyWrapper('//Bob');
120      const charlie = privateKey('//Charlie');119      const charlie = privateKeyWrapper('//Charlie');
121120
122      const adminListAfterAddAdmin = await getAdminList(api, collectionId);121      const adminListAfterAddAdmin = await getAdminList(api, collectionId);
123      expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(bob.address));122      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,