From ad2fb54926558eb99bcc72fae76e720feee0cac5 Mon Sep 17 00:00:00 2001
From: Greg Zaitsev <greg.zaitsev@gmail.com>
Date: Mon, 28 Jun 2021 13:29:10 +0000
Subject: [PATCH] Fix merge linter errors


---
--- 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
--- 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';
--- 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);
--- 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);

-- 
gitstuff