Merge pull request #589 from 0xProject/feature/truffle-sol-cov

Sol-cov artifact Adapters (truffle)

3 files changed, 1 insertions, 41 deletions

diff --git a/packages/dev-utils/src/coverage.ts b/packages/dev-utils/src/coverage.ts
deleted file mode 100644
index 6f7640835..000000000
--- a/packages/dev-utils/src/coverage.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { CoverageSubprovider } from '@0xproject/sol-cov';
-import * as _ from 'lodash';
-
-import { constants } from './constants';
-
-let coverageSubprovider: CoverageSubprovider;
-
-export const coverage = {
-    getCoverageSubproviderSingleton(): CoverageSubprovider {
-        if (_.isUndefined(coverageSubprovider)) {
-            coverageSubprovider = coverage._getCoverageSubprovider();
-        }
-        return coverageSubprovider;
-    },
-    _getCoverageSubprovider(): CoverageSubprovider {
-        const artifactsPath = '../migrations/artifacts/1.0.0';
-        const contractsPath = 'src/contracts';
-        const defaultFromAddress = constants.TESTRPC_FIRST_ADDRESS;
-        return new CoverageSubprovider(artifactsPath, contractsPath, defaultFromAddress);
-    },
-};
diff --git a/packages/dev-utils/src/index.ts b/packages/dev-utils/src/index.ts
index 9124f3e28..d4c19f1bf 100644
--- a/packages/dev-utils/src/index.ts
+++ b/packages/dev-utils/src/index.ts
@@ -1,6 +1,5 @@
 export { BlockchainLifecycle } from './blockchain_lifecycle';
 export { web3Factory } from './web3_factory';
 export { constants as devConstants } from './constants';
-export { coverage } from './coverage';
 export { env, EnvVars } from './env';
 export { callbackErrorReporter } from './callback_error_reporter';
diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts
index 4cd343c44..5b32d3930 100644
--- a/packages/dev-utils/src/web3_factory.ts
+++ b/packages/dev-utils/src/web3_factory.ts
@@ -13,16 +13,8 @@ import * as _ from 'lodash';
 import * as process from 'process';
 
 import { constants } from './constants';
-import { coverage } from './coverage';
 import { env, EnvVars } from './env';
 
-// HACK: web3 leaks XMLHttpRequest into the global scope and causes requests to hang
-// because they are using the wrong XHR package.
-// importing web3 after subproviders fixes this issue
-// Filed issue: https://github.com/ethereum/web3.js/issues/844
-// tslint:disable-next-line:ordered-imports
-import * as Web3 from 'web3';
-
 export interface Web3Config {
     hasAddresses?: boolean; // default: true
     shouldUseInProcessGanache?: boolean; // default: false
@@ -30,18 +22,8 @@ export interface Web3Config {
 }
 
 export const web3Factory = {
-    create(config: Web3Config = {}): Web3 {
-        const provider = this.getRpcProvider(config);
-        const web3 = new Web3();
-        web3.setProvider(provider);
-        return web3;
-    },
-    getRpcProvider(config: Web3Config = {}): Provider {
+    getRpcProvider(config: Web3Config = {}): ProviderEngine {
         const provider = new ProviderEngine();
-        const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
-        if (isCoverageEnabled) {
-            provider.addProvider(coverage.getCoverageSubproviderSingleton());
-        }
         const hasAddresses = _.isUndefined(config.hasAddresses) || config.hasAddresses;
         if (!hasAddresses) {
             provider.addProvider(new EmptyWalletSubprovider());