difftreelog
Fix merge linter errors
in: master
4 files changed
tests/src/config.tsdiffbeforeafterboth--- a/tests/src/config.ts
+++ b/tests/src/config.ts
@@ -6,12 +6,7 @@
import process from 'process';
const config = {
-<<<<<<< HEAD
substrateUrl: process.env.substrateUrl || 'ws://127.0.0.1:9844',
};
-=======
- substrateUrl: process.env.substrateUrl || 'ws://127.0.0.1:9944'
-}
->>>>>>> develop
export default config;
\ No newline at end of file
tests/src/removeFromWhiteList.test.tsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56import chai from 'chai';7import chaiAsPromised from 'chai-as-promised';8import { default as usingApi } from './substrate/substrate-api';9import {10 createCollectionExpectSuccess,11 destroyCollectionExpectSuccess,12 enableWhiteListExpectSuccess,13 addToWhiteListExpectSuccess,14 removeFromWhiteListExpectSuccess,15 isWhitelisted,16 findNotExistingCollection,17 removeFromWhiteListExpectFailure,18 disableWhiteListExpectSuccess,19 normalizeAccountId,20} from './util/helpers';21import { IKeyringPair } from '@polkadot/types/types';22import privateKey from './substrate/privateKey';2324chai.use(chaiAsPromised);25const expect = chai.expect;2627describe('Integration Test removeFromWhiteList', () => {28 let alice: IKeyringPair;29 let bob: IKeyringPair;3031 before(async () => {32 await usingApi(async () => {33 alice = privateKey('//Alice');34 bob = privateKey('//Bob');35 });36 });3738 it('ensure bob is not in whitelist after removal', async () => {39 await usingApi(async () => {40 const collectionId = await createCollectionExpectSuccess({ mode: { type: 'NFT' } });41 await enableWhiteListExpectSuccess(alice, collectionId);42 await addToWhiteListExpectSuccess(alice, collectionId, bob.address);4344 await removeFromWhiteListExpectSuccess(alice, collectionId, normalizeAccountId(bob.address));45 expect(await isWhitelisted(collectionId, bob.address)).to.be.false;46 });47 });4849 it('allows removal from collection with unset whitelist status', async () => {50 await usingApi(async () => {51 const collectionWithoutWhitelistId = await createCollectionExpectSuccess();52 await enableWhiteListExpectSuccess(alice, collectionWithoutWhitelistId);53 await addToWhiteListExpectSuccess(alice, collectionWithoutWhitelistId, bob.address);54 await disableWhiteListExpectSuccess(alice, collectionWithoutWhitelistId);5556 await removeFromWhiteListExpectSuccess(alice, collectionWithoutWhitelistId, normalizeAccountId(bob.address));57 });58 });59});6061describe('Negative Integration Test removeFromWhiteList', () => {62 let alice: IKeyringPair;63 let bob: IKeyringPair;6465 before(async () => {66 await usingApi(async () => {67 alice = privateKey('//Alice');68 bob = privateKey('//Bob');69 });70 });7172 it('fails on removal from not existing collection', async () => {73 await usingApi(async (api) => {74 const collectionId = await findNotExistingCollection(api);7576 await removeFromWhiteListExpectFailure(alice, collectionId, normalizeAccountId(bob.address));77 });78 });7980 it('fails on removal from removed collection', async () => {81 await usingApi(async () => {82 const collectionId = await createCollectionExpectSuccess();83 await enableWhiteListExpectSuccess(alice, collectionId);84 await addToWhiteListExpectSuccess(alice, collectionId, bob.address);85 await destroyCollectionExpectSuccess(collectionId);8687 await removeFromWhiteListExpectFailure(alice, collectionId, normalizeAccountId(bob.address));88 });89 });90});tests/src/toggleContractWhiteList.test.tsdiffbeforeafterboth--- a/tests/src/toggleContractWhiteList.test.ts
+++ b/tests/src/toggleContractWhiteList.test.ts
@@ -51,7 +51,7 @@
expect(flipValueAfter).to.be.eq(!flipValueBefore, 'Anyone can call new contract.');
const deployerCanFlip = async () => {
- let flipValueBefore = await getFlipValue(contract, deployer);
+ const flipValueBefore = await getFlipValue(contract, deployer);
const deployerFlip = contract.tx.flip(value, gasLimit);
await submitTransactionAsync(deployer, deployerFlip);
const aliceFlip1Response = await getFlipValue(contract, deployer);
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -40,7 +40,7 @@
}
// AccountId
- return {substrate: input.toString()}
+ return {substrate: input.toString()};
}
export function toSubstrateAddress(input: string | CrossAccountId | IKeyringPair): string {
input = normalizeAccountId(input);