Move log decoding to AbiDecoder

1 files changed, 2 insertions, 21 deletions

diff --git a/src/0x.ts b/src/0x.ts
index 275689f30..d89c07aa6 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -302,7 +302,8 @@ export class ZeroEx {
                 const transactionReceipt = await this._web3Wrapper.getTransactionReceiptAsync(txHash);
                 if (!_.isNull(transactionReceipt)) {
                     intervalUtils.clearAsyncExcludingInterval(intervalId);
-                    const logsWithDecodedArgs = _.map(transactionReceipt.logs, this.tryToDecodeLogOrNoOp.bind(this));
+                    const tryToDecodeLogOrNoOp = this._abiDecoder.tryToDecodeLogOrNoOp.bind(this._abiDecoder);
+                    const logsWithDecodedArgs = _.map(transactionReceipt.logs, tryToDecodeLogOrNoOp);
                     const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = {
                         ...transactionReceipt,
                         logs: logsWithDecodedArgs,
@@ -313,26 +314,6 @@ export class ZeroEx {
         });
         return txReceiptPromise;
     }
-    /**
-     * Gets historical logs without creating a subscription
-     * @param   filter            Filter object
-     * @return  Array of logs that match the filter
-     */
-    public async getLogsAsync(filter: FilterObject): Promise<RawLog[]> {
-        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.