From c122e06871b1d48a27e5c5afeb83d1e130dcf2f1 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 12 Nov 2019 11:28:18 +0100 Subject: [PATCH] add allowSyntheticDefaultImports --- integration/tsconfig.json | 3 ++- src/keeper/contracts/ContractBase.ts | 2 +- test/keeper/TestContractHandler.ts | 3 ++- test/tsconfig.json | 3 ++- tsconfig.json | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/integration/tsconfig.json b/integration/tsconfig.json index 68cc3b6..7286bef 100644 --- a/integration/tsconfig.json +++ b/integration/tsconfig.json @@ -3,6 +3,7 @@ "resolveJsonModule": true, "lib": ["es6", "es7", "dom"], "noUnusedLocals": true, - "esModuleInterop": true + "esModuleInterop": true, + "allowSyntheticDefaultImports": true } } diff --git a/src/keeper/contracts/ContractBase.ts b/src/keeper/contracts/ContractBase.ts index 589ab6e..0cac800 100644 --- a/src/keeper/contracts/ContractBase.ts +++ b/src/keeper/contracts/ContractBase.ts @@ -15,7 +15,7 @@ export abstract class ContractBase extends Instantiable { return this.contract.options.address } - constructor(contractName, private optional: boolean = false) { + constructor(contractName: string, private optional: boolean = false) { super() this.contractName = contractName } diff --git a/test/keeper/TestContractHandler.ts b/test/keeper/TestContractHandler.ts index f4e1853..39a2025 100644 --- a/test/keeper/TestContractHandler.ts +++ b/test/keeper/TestContractHandler.ts @@ -130,8 +130,9 @@ export default class TestContractHandler extends ContractHandler { const sendConfig = { from, gas: 3000000, - gasPrice: String(10000000000) + gasPrice: '10000000000' } + // eslint-disable-next-line security/detect-non-literal-require const artifact = require(`@oceanprotocol/keeper-contracts/artifacts/${name}.development.json`) const tempContract = new web3.eth.Contract(artifact.abi, artifact.address) const isZos = !!tempContract.methods.initialize diff --git a/test/tsconfig.json b/test/tsconfig.json index 14083c9..606f325 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -3,6 +3,7 @@ "resolveJsonModule": true, "lib": ["es6", "es7"], "noUnusedLocals": true, - "esModuleInterop": true + "esModuleInterop": true, + "allowSyntheticDefaultImports": true } } diff --git a/tsconfig.json b/tsconfig.json index 3624d65..91114cb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,7 @@ "resolveJsonModule": true, "moduleResolution": "node", "esModuleInterop": true, + "allowSyntheticDefaultImports": true, "lib": ["es2017", "es6", "es7", "dom"], "declaration": true, "module": "commonjs",