diff options
author | Fabio Berger <me@fabioberger.com> | 2018-07-14 02:12:37 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-14 02:12:37 +0800 |
commit | e2438330f588eba03d50c18943b24d6e7f9e9479 (patch) | |
tree | 33ba5ae3919d67c6a5faa7b0ed07249fa5b8d694 /packages/metacoin | |
parent | 9b387b8ec3c543b5c96d1887550797a2bb90fe94 (diff) | |
parent | 2f0a9148387b66d75b9ee3856e68f0ed3aa149de (diff) | |
download | dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.gz dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.bz2 dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.lz dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.xz dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.zst dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.zip |
Merge pull request #874 from 0xProject/fix/request-timeout-issue
Fix Fetch Timeout Issue
Diffstat (limited to 'packages/metacoin')
-rw-r--r-- | packages/metacoin/package.json | 3 | ||||
-rw-r--r-- | packages/metacoin/test/utils/web3_wrapper.ts | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 9b96441c4..744e9e69a 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -44,8 +44,7 @@ "ethereum-types": "^0.0.2", "ethers": "3.0.22", "lodash": "^4.17.4", - "run-s": "^0.0.0", - "web3-provider-engine": "14.0.6" + "run-s": "^0.0.0" }, "devDependencies": { "@0xproject/dev-utils": "^0.4.5", diff --git a/packages/metacoin/test/utils/web3_wrapper.ts b/packages/metacoin/test/utils/web3_wrapper.ts index d3655cb6a..36bd6343f 100644 --- a/packages/metacoin/test/utils/web3_wrapper.ts +++ b/packages/metacoin/test/utils/web3_wrapper.ts @@ -1,10 +1,8 @@ import { env, EnvVars } from '@0xproject/dev-utils'; -import { GanacheSubprovider, prependSubprovider } from '@0xproject/subproviders'; +import { GanacheSubprovider, prependSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; import { errorUtils, logUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as fs from 'fs'; -import ProviderEngine = require('web3-provider-engine'); -import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); import { config } from './config'; import { coverage } from './coverage'; @@ -30,7 +28,7 @@ switch (process.env.TEST_PROVIDER) { throw errorUtils.spawnSwitchErr('TEST_PROVIDER', process.env.TEST_PROVIDER); } -export const provider = new ProviderEngine(); +export const provider = new Web3ProviderEngine(); if (testProvider === ProviderType.Ganache) { provider.addProvider( new GanacheSubprovider({ @@ -45,7 +43,7 @@ if (testProvider === ProviderType.Ganache) { }), ); } else { - provider.addProvider(new RpcSubprovider({ rpcUrl: 'http://localhost:8501' })); + provider.addProvider(new RPCSubprovider('http://localhost:8501')); } provider.start(); |