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

difftreelog

Merge pull request #377 from UniqueNetwork/feature/CORE-302-ss58Format

kozyrevdev2022-06-09parents: #0f16e44 #bd269a2.patch.diff
in: master
test(ss58Format): more test fixes

3 files changed

modifiedtests/src/addCollectionAdmin.test.tsdiffbeforeafterboth
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);
modifiedtests/src/removeCollectionAdmin.test.tsdiffbeforeafterboth
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));
modifiedtests/src/scheduler.test.tsdiffbeforeafterboth
1616
17import chai, {expect} from 'chai';17import chai, {expect} from 'chai';
18import chaiAsPromised from 'chai-as-promised';18import chaiAsPromised from 'chai-as-promised';
19import privateKey from './substrate/privateKey';
20import {19import {
21 default as usingApi, 20 default as usingApi,
22 submitTransactionAsync,21 submitTransactionAsync,