From a9681072ee4b45bda23b754fa46175b68c09b8b9 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 3 Oct 2017 12:20:33 +0300
Subject: Factor out tryToDecodeLogOrNoOp

---
 src/0x.ts | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/0x.ts b/src/0x.ts
index ae29b8d70..275689f30 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -302,17 +302,7 @@ export class ZeroEx {
                 const transactionReceipt = await this._web3Wrapper.getTransactionReceiptAsync(txHash);
                 if (!_.isNull(transactionReceipt)) {
                     intervalUtils.clearAsyncExcludingInterval(intervalId);
-                    const logsWithDecodedArgs = _.map(transactionReceipt.logs, (log: Web3.LogEntry) => {
-                        const decodedLog = this._abiDecoder.decodeLog(log);
-                        if (_.isUndefined(decodedLog)) {
-                            return log;
-                        }
-                        const logWithDecodedArgs: LogWithDecodedArgs = {
-                            ...log,
-                            ...decodedLog,
-                        };
-                        return logWithDecodedArgs;
-                    });
+                    const logsWithDecodedArgs = _.map(transactionReceipt.logs, this.tryToDecodeLogOrNoOp.bind(this));
                     const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = {
                         ...transactionReceipt,
                         logs: logsWithDecodedArgs,
@@ -332,6 +322,17 @@ export class ZeroEx {
         const logs = await this._web3Wrapper.getLogsAsync(filter);
         return logs;
     }
+    private tryToDecodeLogOrNoOp(log: Web3.LogEntry): LogWithDecodedArgs|Web3.LogEntry {
+        const decodedLog = this._abiDecoder.decodeLog(log);
+        if (_.isUndefined(decodedLog)) {
+            return log;
+        }
+        const logWithDecodedArgs: LogWithDecodedArgs = {
+            ...log,
+            ...decodedLog,
+        };
+        return logWithDecodedArgs;
+    }
     /*
      * HACK: `TokenWrapper` needs a token transfer proxy address. `TokenTransferProxy` address is fetched from
      * an `ExchangeWrapper`. `ExchangeWrapper` needs `TokenWrapper` to validate orders, creating a dependency cycle.
-- 
cgit v1.2.3