Use provider over web3 in deployer, dev-utils and subprovider tests, rename subprovider to ganacheSubprovider in test util

2 files changed, 7 insertions, 4 deletions

diff --git a/packages/deployer/test/deployer_test.ts b/packages/deployer/test/deployer_test.ts
index eadb535ab..238624220 100644
--- a/packages/deployer/test/deployer_test.ts
+++ b/packages/deployer/test/deployer_test.ts
@@ -27,7 +27,7 @@ describe('#Deployer', () => {
     const deployerOpts = {
         artifactsDir,
         networkId: constants.networkId,
-        web3Provider: provider,
+        provider,
         defaults: {
             gasPrice: constants.gasPrice,
         },
diff --git a/packages/deployer/test/util/provider.ts b/packages/deployer/test/util/provider.ts
index bc0f55028..e0fcb362a 100644
--- a/packages/deployer/test/util/provider.ts
+++ b/packages/deployer/test/util/provider.ts
@@ -1,6 +1,9 @@
 import { web3Factory } from '@0xproject/dev-utils';
+import { Provider } from '@0xproject/types';
 import * as Web3 from 'web3';
 
-const web3ProviderConfig = { shouldUseInProcessGanache: true };
-const web3Instance = web3Factory.create(web3ProviderConfig);
-export const provider = web3Instance.currentProvider;
+const providerConfigs = { shouldUseInProcessGanache: true };
+const web3Instance = web3Factory.create(providerConfigs);
+const provider: Provider = web3Instance.currentProvider;
+
+export { provider };