diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-12 01:54:59 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-12 01:54:59 +0800 |
| commit | 60f5a52964d6965d35eb3c3cb15abc8471de6fd6 (patch) | |
| tree | 3912c687aa7e3eb9891d1f4d5a46d516805a4503 /packages/contract-wrappers/test/global_hooks.ts | |
| parent | 89b7b56a2cb38d95f65067e5493e8135cb1e7e98 (diff) | |
| parent | 7e5866ce3fffc67633d3ab84cc3d2a6abdd22ce5 (diff) | |
| download | dexon-0x-contracts-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar.gz dexon-0x-contracts-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar.zst dexon-0x-contracts-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.zip | |
Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulator
* v2-prototype:
Fix a bug in SolCompilerArtifacts adapter config overriding
Increase timeout for contract migrations
Remove some copy-paste code
Await transactions in migrations
Fix typos
Await transactions in migrations
Await fake transactions
Fix a typo
Implement SolidityProfiler & adapt sol-cov to work with Geth
# Conflicts:
# packages/migrations/CHANGELOG.json
Diffstat (limited to 'packages/contract-wrappers/test/global_hooks.ts')
| -rw-r--r-- | packages/contract-wrappers/test/global_hooks.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contract-wrappers/test/global_hooks.ts b/packages/contract-wrappers/test/global_hooks.ts index 9d6903af5..52a384ada 100644 --- a/packages/contract-wrappers/test/global_hooks.ts +++ b/packages/contract-wrappers/test/global_hooks.ts @@ -6,7 +6,7 @@ import { provider } from './utils/web3_wrapper'; 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. - const mochaTestTimeoutMs = 20000; + const mochaTestTimeoutMs = 50000; this.timeout(mochaTestTimeoutMs); const txDefaults = { gas: devConstants.GAS_LIMIT, |