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