diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-14 17:30:51 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-14 17:30:51 +0800 |
| commit | c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6 (patch) | |
| tree | 986b220cf80aab8d8e8ef6c4cef8c08be6eeab10 /packages/0x.js | |
| parent | 7d60356facce60c1d4d80c703bfc565c5c47e73b (diff) | |
| parent | 58fa35641d3016ef106496c929e48febcf827dc6 (diff) | |
| download | dexon-sol-tools-c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6.tar dexon-sol-tools-c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6.tar.gz dexon-sol-tools-c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6.tar.bz2 dexon-sol-tools-c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6.tar.lz dexon-sol-tools-c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6.tar.xz dexon-sol-tools-c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6.tar.zst dexon-sol-tools-c94d1b22754c1d1bf10f0dd2b9c13eea91e17cb6.zip | |
Merge branch 'development' of github.com:0xProject/0x-monorepo into development
* 'development' of github.com:0xProject/0x-monorepo:
Add missing type definitions
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/package.json | 1 | ||||
| -rw-r--r-- | packages/0x.js/src/0x.ts | 2 | ||||
| -rw-r--r-- | packages/0x.js/test/global_hooks.ts | 2 | ||||
| -rw-r--r-- | packages/0x.js/test/utils/chai_setup.ts | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index d048c8be6..36ea0751f 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -103,6 +103,7 @@ "@0xproject/order-utils": "^0.0.4", "@0xproject/types": "^0.6.3", "@0xproject/typescript-typings": "^0.3.1", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/utils": "^0.6.1", "@0xproject/web3-wrapper": "^0.6.3", "ethers": "^3.0.15", diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts index e0192d5ef..206954a0b 100644 --- a/packages/0x.js/src/0x.ts +++ b/packages/0x.js/src/0x.ts @@ -200,7 +200,7 @@ export class ZeroEx { */ public async awaitTransactionMinedAsync( txHash: string, - pollingIntervalMs = 1000, + pollingIntervalMs: number = 1000, timeoutMs?: number, ): Promise<TransactionReceiptWithDecodedLogs> { // Hack: Get Web3Wrapper from ContractWrappers diff --git a/packages/0x.js/test/global_hooks.ts b/packages/0x.js/test/global_hooks.ts index 88f202761..53b3ef545 100644 --- a/packages/0x.js/test/global_hooks.ts +++ b/packages/0x.js/test/global_hooks.ts @@ -5,7 +5,7 @@ import * as path from 'path'; import { constants } from './utils/constants'; import { provider } from './utils/web3_wrapper'; -before('migrate contracts', async function() { +before('migrate contracts', async function(): Promise<void> { // HACK: Since the migrations take longer then our global mocha timeout limit // we manually increase it for this before hook. this.timeout(20000); diff --git a/packages/0x.js/test/utils/chai_setup.ts b/packages/0x.js/test/utils/chai_setup.ts index 078edd309..1a8733093 100644 --- a/packages/0x.js/test/utils/chai_setup.ts +++ b/packages/0x.js/test/utils/chai_setup.ts @@ -4,7 +4,7 @@ import ChaiBigNumber = require('chai-bignumber'); import * as dirtyChai from 'dirty-chai'; export const chaiSetup = { - configure() { + configure(): void { chai.config.includeStack = true; chai.use(ChaiBigNumber()); chai.use(dirtyChai); |