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.tsdiffbeforeafterboth--- a/tests/src/removeFromWhiteList.test.ts
+++ b/tests/src/removeFromWhiteList.test.ts
@@ -16,7 +16,7 @@
findNotExistingCollection,
removeFromWhiteListExpectFailure,
disableWhiteListExpectSuccess,
- normalizeAccountId
+ normalizeAccountId,
} from './util/helpers';
import { IKeyringPair } from '@polkadot/types/types';
import privateKey from './substrate/privateKey';
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.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);