diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-23 00:25:02 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-23 00:25:02 +0800 |
| commit | 4a0c8d72b05152ee2fd71245873d5a70f7281058 (patch) | |
| tree | 2c28ad8214aaaa10913a621509d0ae4020ee4d3d /packages/0x.js | |
| parent | d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3 (diff) | |
| parent | ab9cfd293b3ccc2aacb4238aebe2b033e55b7935 (diff) | |
| download | dexon-sol-tools-4a0c8d72b05152ee2fd71245873d5a70f7281058.tar.gz dexon-sol-tools-4a0c8d72b05152ee2fd71245873d5a70f7281058.tar.zst dexon-sol-tools-4a0c8d72b05152ee2fd71245873d5a70f7281058.zip | |
merge development
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts | 16 | ||||
| -rw-r--r-- | packages/0x.js/test/global_hooks.ts | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts b/packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts index 9da31481a..f7f6727f0 100644 --- a/packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts +++ b/packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts @@ -1,9 +1,23 @@ +const networkNameToId: { [networkName: string]: number } = { + mainnet: 1, + ropsten: 3, + rinkeby: 4, + kovan: 42, + ganache: 50, +}; + export const zeroExPublicNetworkConfigSchema = { id: '/ZeroExPublicNetworkConfig', properties: { networkId: { type: 'number', - enum: [1, 3, 4, 42, 50], + enum: [ + networkNameToId.mainnet, + networkNameToId.ropsten, + networkNameToId.rinkeby, + networkNameToId.kovan, + networkNameToId.ganache, + ], }, gasPrice: { $ref: '/Number' }, zrxContractAddress: { $ref: '/Address' }, diff --git a/packages/0x.js/test/global_hooks.ts b/packages/0x.js/test/global_hooks.ts index 53b3ef545..fa1dfae38 100644 --- a/packages/0x.js/test/global_hooks.ts +++ b/packages/0x.js/test/global_hooks.ts @@ -8,7 +8,8 @@ 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. - this.timeout(20000); + const mochaTestTimeoutMs = 20000; + this.timeout(mochaTestTimeoutMs); const txDefaults = { gas: devConstants.GAS_ESTIMATE, from: devConstants.TESTRPC_FIRST_ADDRESS, |