difftreelog
Fix merge linter errors
in: master
4 files changed
tests/src/config.tsdiffbeforeafterboth6import process from 'process';6import process from 'process';778const config = {8const config = {9<<<<<<< HEAD10 substrateUrl: process.env.substrateUrl || 'ws://127.0.0.1:9844',9 substrateUrl: process.env.substrateUrl || 'ws://127.0.0.1:9844',11};10};12=======13 substrateUrl: process.env.substrateUrl || 'ws://127.0.0.1:9944'14}15>>>>>>> develop161117export default config;12export default config;tests/src/removeFromWhiteList.test.tsdiffbeforeafterboth16 findNotExistingCollection,16 findNotExistingCollection,17 removeFromWhiteListExpectFailure,17 removeFromWhiteListExpectFailure,18 disableWhiteListExpectSuccess,18 disableWhiteListExpectSuccess,19 normalizeAccountId19 normalizeAccountId,20} from './util/helpers';20} from './util/helpers';21import { IKeyringPair } from '@polkadot/types/types';21import { IKeyringPair } from '@polkadot/types/types';22import privateKey from './substrate/privateKey';22import privateKey from './substrate/privateKey';tests/src/toggleContractWhiteList.test.tsdiffbeforeafterboth51 expect(flipValueAfter).to.be.eq(!flipValueBefore, 'Anyone can call new contract.');51 expect(flipValueAfter).to.be.eq(!flipValueBefore, 'Anyone can call new contract.');525253 const deployerCanFlip = async () => {53 const deployerCanFlip = async () => {54 let flipValueBefore = await getFlipValue(contract, deployer);54 const flipValueBefore = await getFlipValue(contract, deployer);55 const deployerFlip = contract.tx.flip(value, gasLimit);55 const deployerFlip = contract.tx.flip(value, gasLimit);56 await submitTransactionAsync(deployer, deployerFlip);56 await submitTransactionAsync(deployer, deployerFlip);57 const aliceFlip1Response = await getFlipValue(contract, deployer);57 const aliceFlip1Response = await getFlipValue(contract, deployer);tests/src/util/helpers.tsdiffbeforeafterboth40 }40 }414142 // AccountId42 // AccountId43 return {substrate: input.toString()}43 return {substrate: input.toString()};44}44}45export function toSubstrateAddress(input: string | CrossAccountId | IKeyringPair): string {45export function toSubstrateAddress(input: string | CrossAccountId | IKeyringPair): string {46 input = normalizeAccountId(input);46 input = normalizeAccountId(input);