From 263bfb1bdad8acdb9b534edf6e79024e8da35721 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Thu, 14 Jun 2018 15:46:59 -0700
Subject: Fix a bug in revert_trace.ts

---
 packages/contracts/src/utils/web3_wrapper.ts | 46 ++++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'packages/contracts/src')

diff --git a/packages/contracts/src/utils/web3_wrapper.ts b/packages/contracts/src/utils/web3_wrapper.ts
index b8e8ed8ce..f51ad435b 100644
--- a/packages/contracts/src/utils/web3_wrapper.ts
+++ b/packages/contracts/src/utils/web3_wrapper.ts
@@ -51,29 +51,29 @@ const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
 const isProfilerEnabled = env.parseBoolean(EnvVars.SolidityProfiler);
 const isRevertTraceEnabled = env.parseBoolean(EnvVars.SolidityRevertTrace);
 // TODO(albrow): Include revertTrace checks in the warnings below.
-// if (isCoverageEnabled && isProfilerEnabled) {
-//     throw new Error(
-//         `Unfortunately for now you can't enable both coverage and profiler at the same time. They both use coverage.json file and there is no way to configure that.`,
-//     );
-// }
-// if (isCoverageEnabled) {
-//     const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
-//     prependSubprovider(provider, coverageSubprovider);
-// }
-// if (isProfilerEnabled) {
-//     if (testProvider === ProviderType.Ganache) {
-//         logUtils.warn(
-//             "Gas costs in Ganache traces are incorrect and we don't recommend using it for profiling. Please switch to Geth",
-//         );
-//         process.exit(1);
-//     }
-//     const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
-//     logUtils.log(
-//         "By default profilerSubprovider is stopped so that you don't get noise from setup code. Don't forget to start it before the code you want to profile and stop it afterwards",
-//     );
-//     profilerSubprovider.stop();
-//     prependSubprovider(provider, profilerSubprovider);
-// }
+if (isCoverageEnabled && isProfilerEnabled) {
+    throw new Error(
+        `Unfortunately for now you can't enable both coverage and profiler at the same time. They both use coverage.json file and there is no way to configure that.`,
+    );
+}
+if (isCoverageEnabled) {
+    const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
+    prependSubprovider(provider, coverageSubprovider);
+}
+if (isProfilerEnabled) {
+    if (testProvider === ProviderType.Ganache) {
+        logUtils.warn(
+            "Gas costs in Ganache traces are incorrect and we don't recommend using it for profiling. Please switch to Geth",
+        );
+        process.exit(1);
+    }
+    const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
+    logUtils.log(
+        "By default profilerSubprovider is stopped so that you don't get noise from setup code. Don't forget to start it before the code you want to profile and stop it afterwards",
+    );
+    profilerSubprovider.stop();
+    prependSubprovider(provider, profilerSubprovider);
+}
 if (isRevertTraceEnabled) {
     const revertTraceSubprovider = revertTrace.getRevertTraceSubproviderSingleton();
     prependSubprovider(provider, revertTraceSubprovider);
-- 
cgit v1.2.3