From c2ec4174b765d2f3352dd0fd8b04e4d2c1955d64 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 15 Jan 2019 12:09:17 +0100
Subject: Revert "Remove logAsyncErrors hack"

This reverts commit 7ea274b7316ddc40298a66278a14a735cfd314de.
---
 .../src/trace_collection_subprovider.ts            | 78 ++++++++++++----------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/packages/sol-tracing-utils/src/trace_collection_subprovider.ts b/packages/sol-tracing-utils/src/trace_collection_subprovider.ts
index a57ecaad3..d79c5ca22 100644
--- a/packages/sol-tracing-utils/src/trace_collection_subprovider.ts
+++ b/packages/sol-tracing-utils/src/trace_collection_subprovider.ts
@@ -21,6 +21,24 @@ export interface TraceCollectionSubproviderConfig {
     shouldCollectGasEstimateTraces: boolean;
 }
 
+type AsyncFunc = (...args: any[]) => Promise<void>;
+
+// This wrapper outputs errors to console even if the promise gets ignored
+// we need this because web3-provider-engine does not handle promises in
+// the after function of next(after).
+function logAsyncErrors(fn: AsyncFunc): AsyncFunc {
+    async function wrappedAsync(...args: any[]): Promise<void> {
+        try {
+            await fn(...args);
+        } catch (err) {
+            // tslint:disable-next-line no-console
+            logUtils.error(err);
+            throw err;
+        }
+    }
+    return wrappedAsync;
+}
+
 // Because there is no notion of a call trace in the Ethereum rpc - we collect them in a rather non-obvious/hacky way.
 // On each call - we create a snapshot, execute the call as a transaction, get the trace, revert the snapshot.
 // That allows us to avoid influencing test behaviour.
@@ -75,7 +93,7 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
                         next();
                     } else {
                         const txData = payload.params[0];
-                        next(this._onTransactionSentAsync.bind(this, txData));
+                        next(logAsyncErrors(this._onTransactionSentAsync.bind(this, txData)));
                     }
                     return;
 
@@ -84,7 +102,7 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
                         next();
                     } else {
                         const callData = payload.params[0];
-                        next(this._onCallOrGasEstimateExecutedAsync.bind(this, callData));
+                        next(logAsyncErrors(this._onCallOrGasEstimateExecutedAsync.bind(this, callData)));
                     }
                     return;
 
@@ -93,7 +111,7 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
                         next();
                     } else {
                         const estimateGasData = payload.params[0];
-                        next(this._onCallOrGasEstimateExecutedAsync.bind(this, estimateGasData));
+                        next(logAsyncErrors(this._onCallOrGasEstimateExecutedAsync.bind(this, estimateGasData)));
                     }
                     return;
 
@@ -127,35 +145,31 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
         txHash: string | undefined,
         cb: Callback,
     ): Promise<void> {
-        try {
-            if (!txData.isFakeTransaction) {
-                // This transaction is a usual transaction. Not a call executed as one.
-                // And we don't want it to be executed within a snapshotting period
-                await this._lock.acquire();
-            }
-            const NULL_ADDRESS = '0x0';
-            if (_.isNull(err)) {
+        if (!txData.isFakeTransaction) {
+            // This transaction is a usual transaction. Not a call executed as one.
+            // And we don't want it to be executed within a snapshotting period
+            await this._lock.acquire();
+        }
+        const NULL_ADDRESS = '0x0';
+        if (_.isNull(err)) {
+            const toAddress =
+                _.isUndefined(txData.to) || txData.to === NULL_ADDRESS ? constants.NEW_CONTRACT : txData.to;
+            await this._recordTxTraceAsync(toAddress, txData.data, txHash as string);
+        } else {
+            const latestBlock = await this._web3Wrapper.getBlockWithTransactionDataAsync(BlockParamLiteral.Latest);
+            const transactions = latestBlock.transactions;
+            for (const transaction of transactions) {
                 const toAddress =
                     _.isUndefined(txData.to) || txData.to === NULL_ADDRESS ? constants.NEW_CONTRACT : txData.to;
-                await this._recordTxTraceAsync(toAddress, txData.data, txHash as string);
-            } else {
-                const latestBlock = await this._web3Wrapper.getBlockWithTransactionDataAsync(BlockParamLiteral.Latest);
-                const transactions = latestBlock.transactions;
-                for (const transaction of transactions) {
-                    const toAddress =
-                        _.isUndefined(txData.to) || txData.to === NULL_ADDRESS ? constants.NEW_CONTRACT : txData.to;
-                    await this._recordTxTraceAsync(toAddress, transaction.input, transaction.hash);
-                }
+                await this._recordTxTraceAsync(toAddress, transaction.input, transaction.hash);
             }
-            if (!txData.isFakeTransaction) {
-                // This transaction is a usual transaction. Not a call executed as one.
-                // And we don't want it to be executed within a snapshotting period
-                this._lock.release();
-            }
-            cb();
-        } catch (err) {
-            cb(err);
         }
+        if (!txData.isFakeTransaction) {
+            // This transaction is a usual transaction. Not a call executed as one.
+            // And we don't want it to be executed within a snapshotting period
+            this._lock.release();
+        }
+        cb();
     }
     private async _onCallOrGasEstimateExecutedAsync(
         callData: Partial<CallDataRPC>,
@@ -163,12 +177,8 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
         _callResult: string,
         cb: Callback,
     ): Promise<void> {
-        try {
-            await this._recordCallOrGasEstimateTraceAsync(callData);
-            cb();
-        } catch (err) {
-            cb(err);
-        }
+        await this._recordCallOrGasEstimateTraceAsync(callData);
+        cb();
     }
     private async _recordCallOrGasEstimateTraceAsync(callData: Partial<CallDataRPC>): Promise<void> {
         // We don't want other transactions to be exeucted during snashotting period, that's why we lock the
-- 
cgit v1.2.3