diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-07 18:27:03 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-07 18:27:03 +0800 |
| commit | 73429fc7202ff7b58eb64a7e0b939b971f16a27e (patch) | |
| tree | 6abd050f91750c819e98045d21cd8952a0e14071 /packages/base-contract | |
| parent | cb754ee1253622974e751e4a8d723a424250c878 (diff) | |
| parent | e0bc01eea1c20e0afda296f331c6a475e062b59c (diff) | |
| download | dexon-sol-tools-73429fc7202ff7b58eb64a7e0b939b971f16a27e.tar dexon-sol-tools-73429fc7202ff7b58eb64a7e0b939b971f16a27e.tar.gz dexon-sol-tools-73429fc7202ff7b58eb64a7e0b939b971f16a27e.tar.bz2 dexon-sol-tools-73429fc7202ff7b58eb64a7e0b939b971f16a27e.tar.lz dexon-sol-tools-73429fc7202ff7b58eb64a7e0b939b971f16a27e.tar.xz dexon-sol-tools-73429fc7202ff7b58eb64a7e0b939b971f16a27e.tar.zst dexon-sol-tools-73429fc7202ff7b58eb64a7e0b939b971f16a27e.zip | |
merge v2-prototype
Diffstat (limited to 'packages/base-contract')
| -rw-r--r-- | packages/base-contract/package.json | 2 | ||||
| -rw-r--r-- | packages/base-contract/src/index.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index d51362040..cb27e9efa 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -17,7 +17,7 @@ "run_mocha": "mocha lib/test/**/*_test.js --bail --exit", "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", - "lint": "tslint --project .", + "lint": "tslint --project . --exclude **/src/contract_wrappers/**/*", "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "license": "Apache-2.0", diff --git a/packages/base-contract/src/index.ts b/packages/base-contract/src/index.ts index d9e28f9f2..a46d985f5 100644 --- a/packages/base-contract/src/index.ts +++ b/packages/base-contract/src/index.ts @@ -44,6 +44,7 @@ export class BaseContract { const constructorAbiIfExists = _.find( abi, (abiDefinition: AbiDefinition) => abiDefinition.type === AbiType.Constructor, + // tslint:disable-next-line:no-unnecessary-type-assertion ) as ConstructorAbi | undefined; if (!_.isUndefined(constructorAbiIfExists)) { return constructorAbiIfExists; @@ -79,8 +80,7 @@ export class BaseContract { // Awaiting https://github.com/Microsoft/TypeScript/pull/13288 to be merged } as any; if (_.isUndefined(txDataWithDefaults.gas) && !_.isUndefined(estimateGasAsync)) { - const estimatedGas = await estimateGasAsync(txData); - txDataWithDefaults.gas = estimatedGas; + txDataWithDefaults.gas = await estimateGasAsync(txData); } return txDataWithDefaults; } |