Merge branch 'development' into removeMigrateStep

* development:
  Fix tests
  Call static functions as static
  Address feedback
  Move our contract templates to accept Provider instead of Web3Wrapper

2 files changed, 2 insertions, 3 deletions

diff --git a/packages/dev-utils/src/globals.d.ts b/packages/dev-utils/src/globals.d.ts
index 4fee73568..94e63a32d 100644
--- a/packages/dev-utils/src/globals.d.ts
+++ b/packages/dev-utils/src/globals.d.ts
@@ -1,5 +1,3 @@
-declare module 'web3-provider-engine/subproviders/rpc';
-
 declare module '*.json' {
     const json: any;
     /* tslint:disable */
diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts
index 6435f0f9a..f45c36930 100644
--- a/packages/dev-utils/src/web3_factory.ts
+++ b/packages/dev-utils/src/web3_factory.ts
@@ -7,6 +7,7 @@ import ProviderEngine = require('web3-provider-engine');
 import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
 
 import { EmptyWalletSubprovider, FakeGasEstimateSubprovider, GanacheSubprovider } from '@0xproject/subproviders';
+import { Provider } from '@0xproject/types';
 import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as process from 'process';
@@ -34,7 +35,7 @@ export const web3Factory = {
         web3.setProvider(provider);
         return web3;
     },
-    getRpcProvider(config: Web3Config = {}): Web3.Provider {
+    getRpcProvider(config: Web3Config = {}): Provider {
         const provider = new ProviderEngine();
         const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
         if (isCoverageEnabled) {