Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into bug/website/txhash-error

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();