From 72fb8460e90237fb7879fc47e95d84b6aa54911b Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Mon, 21 May 2018 14:26:25 -0700
Subject: [PATCH] Update code after rebase

---
 packages/contracts/{test => src}/utils/assertions.ts | 2 +-
 packages/contracts/src/utils/constants.ts            | 1 +
 packages/contracts/src/utils/web3_wrapper.ts         | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 rename packages/contracts/{test => src}/utils/assertions.ts (91%)

diff --git a/packages/contracts/test/utils/assertions.ts b/packages/contracts/src/utils/assertions.ts
similarity index 91%
rename from packages/contracts/test/utils/assertions.ts
rename to packages/contracts/src/utils/assertions.ts
index 538a6e4fcf..72c2734d8a 100644
--- a/packages/contracts/test/utils/assertions.ts
+++ b/packages/contracts/src/utils/assertions.ts
@@ -1,7 +1,7 @@
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { constants } from '../../util/constants';
+import { constants } from './constants';
 
 const expect = chai.expect;
 
diff --git a/packages/contracts/src/utils/constants.ts b/packages/contracts/src/utils/constants.ts
index 9b0b92545b..144e22bc2e 100644
--- a/packages/contracts/src/utils/constants.ts
+++ b/packages/contracts/src/utils/constants.ts
@@ -19,6 +19,7 @@ const TESTRPC_PRIVATE_KEYS_STRINGS = [
 export const constants = {
     INVALID_OPCODE: 'invalid opcode',
     REVERT: 'revert',
+    ALWAYS_FAILING_TRANSACTION: 'always failing transaction',
     TESTRPC_NETWORK_ID: 50,
     AWAIT_TRANSACTION_MINED_MS: 100,
     MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,
diff --git a/packages/contracts/src/utils/web3_wrapper.ts b/packages/contracts/src/utils/web3_wrapper.ts
index 1049ab9674..a89d7e8d08 100644
--- a/packages/contracts/src/utils/web3_wrapper.ts
+++ b/packages/contracts/src/utils/web3_wrapper.ts
@@ -7,13 +7,17 @@ import { coverage } from './coverage';
 
 export const txDefaults = {
     from: devConstants.TESTRPC_FIRST_ADDRESS,
-    gas: devConstants.GAS_LIMIT,
+    // gas: devConstants.GAS_LIMIT,
+};
+const providerConfigs = {
+    shouldUseInProcessGanache: false,
+    rpcUrl: 'http://localhost:8501',
 };
-const providerConfigs = { shouldUseInProcessGanache: true };
 export const provider = web3Factory.getRpcProvider(providerConfigs);
 const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
 if (isCoverageEnabled) {
     const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
     prependSubprovider(provider, coverageSubprovider);
 }
+
 export const web3Wrapper = new Web3Wrapper(provider);