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