6 files changed, 20 insertions, 11 deletions
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index 34d27081b..2c8ad4943 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -8,7 +8,7 @@
         "build:watch": "tsc -w",
         "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "test": "run-s build run_mocha",
-        "run_mocha": "mocha lib/test/*_test.js",
+        "run_mocha": "mocha lib/test/*_test.js --bail --exit",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "compile": "npm run build; node lib/src/cli.js compile",
@@ -47,7 +47,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/deployer/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.2.1",
+        "@0xproject/dev-utils": "^0.3.4",
         "@0xproject/monorepo-scripts": "^0.1.16",
         "@0xproject/tslint-config": "^0.4.14",
         "@types/require-from-string": "^1.2.0",
diff --git a/packages/deployer/src/cli.ts b/packages/deployer/src/cli.ts
index 62afe0d4c..7b32187c4 100644
--- a/packages/deployer/src/cli.ts
+++ b/packages/deployer/src/cli.ts
@@ -41,8 +41,8 @@ async function onCompileCommandAsync(argv: CliOptions): Promise<void> {
  */
 async function onDeployCommandAsync(argv: CliOptions): Promise<void> {
     const url = argv.jsonrpcUrl;
-    const web3Provider = new Web3.providers.HttpProvider(url);
-    const web3Wrapper = new Web3Wrapper(web3Provider);
+    const provider = new Web3.providers.HttpProvider(url);
+    const web3Wrapper = new Web3Wrapper(provider);
     const networkId = await web3Wrapper.getNetworkIdAsync();
     const compilerOpts: CompilerOptions = {
         contractDirs: getContractDirectoriesFromList(argv.contractDirs),
diff --git a/packages/deployer/src/deployer.ts b/packages/deployer/src/deployer.ts
index 84392997c..e4208e7a1 100644
--- a/packages/deployer/src/deployer.ts
+++ b/packages/deployer/src/deployer.ts
@@ -38,17 +38,17 @@ export class Deployer {
         this._artifactsDir = opts.artifactsDir;
         this._networkId = opts.networkId;
         this._defaults = opts.defaults;
-        let web3Provider: Provider;
+        let provider: Provider;
         if (_.isUndefined((opts as ProviderDeployerOptions).provider)) {
             const jsonrpcUrl = (opts as UrlDeployerOptions).jsonrpcUrl;
             if (_.isUndefined(jsonrpcUrl)) {
-                throw new Error(`Deployer options don't contain web3Provider nor jsonrpcUrl. Please pass one of them`);
+                throw new Error(`Deployer options don't contain provider nor jsonrpcUrl. Please pass one of them`);
             }
-            web3Provider = new Web3.providers.HttpProvider(jsonrpcUrl);
+            provider = new Web3.providers.HttpProvider(jsonrpcUrl);
         } else {
-            web3Provider = (opts as ProviderDeployerOptions).provider;
+            provider = (opts as ProviderDeployerOptions).provider;
         }
-        this.web3Wrapper = new Web3Wrapper(web3Provider, this._defaults);
+        this.web3Wrapper = new Web3Wrapper(provider, this._defaults);
     }
     /**
      * Loads a contract's corresponding artifacts and deploys it with the supplied constructor arguments.
diff --git a/packages/deployer/test/deployer_test.ts b/packages/deployer/test/deployer_test.ts
index 050cf7d02..a213932f9 100644
--- a/packages/deployer/test/deployer_test.ts
+++ b/packages/deployer/test/deployer_test.ts
@@ -14,6 +14,7 @@ import {
 
 import { constructor_args, exchange_binary } from './fixtures/exchange_bin';
 import { constants } from './util/constants';
+import { provider } from './util/provider';
 
 const expect = chai.expect;
 
@@ -36,7 +37,7 @@ describe('#Deployer', () => {
     const deployerOpts = {
         artifactsDir,
         networkId: constants.networkId,
-        jsonrpcUrl: constants.jsonrpcUrl,
+        provider,
         defaults: {
             gasPrice: constants.gasPrice,
         },
diff --git a/packages/deployer/test/util/constants.ts b/packages/deployer/test/util/constants.ts
index 5385b8d17..b93081a80 100644
--- a/packages/deployer/test/util/constants.ts
+++ b/packages/deployer/test/util/constants.ts
@@ -2,7 +2,6 @@ import { BigNumber } from '@0xproject/utils';
 
 export const constants = {
     networkId: 0,
-    jsonrpcUrl: 'http://localhost:8545',
     optimizerEnabled: false,
     gasPrice: new BigNumber(20000000000),
     timeoutMs: 30000,
diff --git a/packages/deployer/test/util/provider.ts b/packages/deployer/test/util/provider.ts
new file mode 100644
index 000000000..e0fcb362a
--- /dev/null
+++ b/packages/deployer/test/util/provider.ts
@@ -0,0 +1,9 @@
+import { web3Factory } from '@0xproject/dev-utils';
+import { Provider } from '@0xproject/types';
+import * as Web3 from 'web3';
+
+const providerConfigs = { shouldUseInProcessGanache: true };
+const web3Instance = web3Factory.create(providerConfigs);
+const provider: Provider = web3Instance.currentProvider;
+
+export { provider };