diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
| commit | 15ce862334be14a7effcd55840ca96e425912df8 (patch) | |
| tree | b51f48dfb6a0dc66745b62521c108472210dcfaa /packages/0x.js/test/utils/constants.ts | |
| parent | 72a00ac2df47ff793d74c2a82c7f403f501e784a (diff) | |
| parent | da0af12834b16c960d9ebf2936eec450825ba987 (diff) | |
| download | dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.gz dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.zst dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.zip | |
Merge branch 'development' into fix/refactorDocs
* development: (30 commits)
Export TransactionOpts type
Make website private
Publish
Update CHANGELOG
Change interval to 1h
Rename
Add ifExists to cleanupJobInterval
Add a cleanup job to an order watcher
Improve the comment
Add CHANGELOG comment
Add a HACK comment
Normalise subprovider names
Remove a comment
Fix a typo
Pin testrpc version
Remove gas params from tests
Add fake gas estimate suprovider for tests
Revert "Fix website linter errors"
Fix website linter errors
Fix tests
...
# Conflicts:
# packages/website/ts/utils/constants.ts
Diffstat (limited to 'packages/0x.js/test/utils/constants.ts')
| -rw-r--r-- | packages/0x.js/test/utils/constants.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/0x.js/test/utils/constants.ts b/packages/0x.js/test/utils/constants.ts index 212abf4d6..75fdf49c9 100644 --- a/packages/0x.js/test/utils/constants.ts +++ b/packages/0x.js/test/utils/constants.ts @@ -8,4 +8,5 @@ export const constants = { KOVAN_RPC_URL: 'https://kovan.infura.io', ROPSTEN_RPC_URL: 'https://ropsten.infura.io', ZRX_DECIMALS: 18, + GAS_ESTIMATE: 500000, }; |