diff options
author | Fabio Berger <me@fabioberger.com> | 2018-04-04 15:31:57 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-04-04 15:31:57 +0800 |
commit | 43e07e7ce3dd61af8048c20aa2355010f0c72c22 (patch) | |
tree | 84da5a773b83e1c5c452ccbd8fb22342f9d28c84 /packages/0x.js/test/utils | |
parent | 5e4e27fed5b9b7c889e6e6e1805377b9eff31a3a (diff) | |
download | dexon-sol-tools-43e07e7ce3dd61af8048c20aa2355010f0c72c22.tar dexon-sol-tools-43e07e7ce3dd61af8048c20aa2355010f0c72c22.tar.gz dexon-sol-tools-43e07e7ce3dd61af8048c20aa2355010f0c72c22.tar.bz2 dexon-sol-tools-43e07e7ce3dd61af8048c20aa2355010f0c72c22.tar.lz dexon-sol-tools-43e07e7ce3dd61af8048c20aa2355010f0c72c22.tar.xz dexon-sol-tools-43e07e7ce3dd61af8048c20aa2355010f0c72c22.tar.zst dexon-sol-tools-43e07e7ce3dd61af8048c20aa2355010f0c72c22.zip |
Update 0x.js to run tests against in-process ganache
Diffstat (limited to 'packages/0x.js/test/utils')
-rw-r--r-- | packages/0x.js/test/utils/constants.ts | 1 | ||||
-rw-r--r-- | packages/0x.js/test/utils/fill_scenarios.ts | 1 | ||||
-rw-r--r-- | packages/0x.js/test/utils/web3_wrapper.ts | 10 |
3 files changed, 9 insertions, 3 deletions
diff --git a/packages/0x.js/test/utils/constants.ts b/packages/0x.js/test/utils/constants.ts index cf030259c..3b74fa863 100644 --- a/packages/0x.js/test/utils/constants.ts +++ b/packages/0x.js/test/utils/constants.ts @@ -6,4 +6,5 @@ export const constants = { KOVAN_RPC_URL: 'https://kovan.infura.io/', ROPSTEN_RPC_URL: 'https://ropsten.infura.io/', ZRX_DECIMALS: 18, + NULL_BYTES: '0x', }; diff --git a/packages/0x.js/test/utils/fill_scenarios.ts b/packages/0x.js/test/utils/fill_scenarios.ts index 8b1308298..25e2aa36f 100644 --- a/packages/0x.js/test/utils/fill_scenarios.ts +++ b/packages/0x.js/test/utils/fill_scenarios.ts @@ -33,6 +33,7 @@ export class FillScenarios { } public async initTokenBalancesAsync() { const web3Wrapper = (this._zeroEx as any)._web3Wrapper as Web3Wrapper; + const networkId = await web3Wrapper.getNetworkIdAsync(); for (const token of this._tokens) { if (token.symbol !== 'ZRX' && token.symbol !== 'WETH') { const defaults = {}; diff --git a/packages/0x.js/test/utils/web3_wrapper.ts b/packages/0x.js/test/utils/web3_wrapper.ts index 4b374fc7e..35898f553 100644 --- a/packages/0x.js/test/utils/web3_wrapper.ts +++ b/packages/0x.js/test/utils/web3_wrapper.ts @@ -1,6 +1,10 @@ -import { web3Factory } from '@0xproject/dev-utils'; +import { devConstants, web3Factory } from '@0xproject/dev-utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as Web3 from 'web3'; -export const web3 = web3Factory.create(); -export const web3Wrapper = new Web3Wrapper(web3.currentProvider); +import { constants } from './constants'; + +const web3 = web3Factory.create({ shouldUseInProcessGanache: true }); +const web3Wrapper = new Web3Wrapper(web3.currentProvider); + +export { web3, web3Wrapper }; |