aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2019-01-15 18:48:04 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2019-01-15 18:48:04 +0800
commitd9675ad6d3ca5e1c124c91d182cfbec9c912fb15 (patch)
tree7262a45be8dff37c4fe8e654a5b8f7fbeea6fdfe
parenta8e32d8c87bd2bcf846f124f2d153fd92658dd1e (diff)
downloaddexon-sol-tools-d9675ad6d3ca5e1c124c91d182cfbec9c912fb15.tar
dexon-sol-tools-d9675ad6d3ca5e1c124c91d182cfbec9c912fb15.tar.gz
dexon-sol-tools-d9675ad6d3ca5e1c124c91d182cfbec9c912fb15.tar.bz2
dexon-sol-tools-d9675ad6d3ca5e1c124c91d182cfbec9c912fb15.tar.lz
dexon-sol-tools-d9675ad6d3ca5e1c124c91d182cfbec9c912fb15.tar.xz
dexon-sol-tools-d9675ad6d3ca5e1c124c91d182cfbec9c912fb15.tar.zst
dexon-sol-tools-d9675ad6d3ca5e1c124c91d182cfbec9c912fb15.zip
Refactor logAsyncErrors to follow our conventions
-rw-r--r--packages/sol-tracing-utils/src/trace_collection_subprovider.ts15
1 files changed, 8 insertions, 7 deletions
diff --git a/packages/sol-tracing-utils/src/trace_collection_subprovider.ts b/packages/sol-tracing-utils/src/trace_collection_subprovider.ts
index e3f5561aa..d79c5ca22 100644
--- a/packages/sol-tracing-utils/src/trace_collection_subprovider.ts
+++ b/packages/sol-tracing-utils/src/trace_collection_subprovider.ts
@@ -1,4 +1,5 @@
import { BlockchainLifecycle } from '@0x/dev-utils';
+import { logUtils } from '@0x/utils';
import { Callback, ErrorCallback, NextCallback, Subprovider } from '@0x/subproviders';
import { CallDataRPC, marshaller, Web3Wrapper } from '@0x/web3-wrapper';
import { JSONRPCRequestPayload, Provider, TxData } from 'ethereum-types';
@@ -25,14 +26,14 @@ 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 logErrors(fn: AsyncFunc): AsyncFunc {
+function logAsyncErrors(fn: AsyncFunc): AsyncFunc {
async function wrappedAsync(...args: any[]): Promise<void> {
try {
await fn(...args);
- } catch (e) {
+ } catch (err) {
// tslint:disable-next-line no-console
- console.error(e);
- throw e;
+ logUtils.error(err);
+ throw err;
}
}
return wrappedAsync;
@@ -92,7 +93,7 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
next();
} else {
const txData = payload.params[0];
- next(logErrors(this._onTransactionSentAsync.bind(this, txData)));
+ next(logAsyncErrors(this._onTransactionSentAsync.bind(this, txData)));
}
return;
@@ -101,7 +102,7 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
next();
} else {
const callData = payload.params[0];
- next(logErrors(this._onCallOrGasEstimateExecutedAsync.bind(this, callData)));
+ next(logAsyncErrors(this._onCallOrGasEstimateExecutedAsync.bind(this, callData)));
}
return;
@@ -110,7 +111,7 @@ export abstract class TraceCollectionSubprovider extends Subprovider {
next();
} else {
const estimateGasData = payload.params[0];
- next(logErrors(this._onCallOrGasEstimateExecutedAsync.bind(this, estimateGasData)));
+ next(logAsyncErrors(this._onCallOrGasEstimateExecutedAsync.bind(this, estimateGasData)));
}
return;