From 4169a41eda164c20528fb40c44753771ed7f7e16 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 25 Feb 2019 12:40:10 -0800
Subject: [PATCH] Rename traceInfo.data to traceInfo.dataIfExists

---
 packages/sol-profiler/src/cost_utils.ts                  | 4 ++--
 packages/sol-tracing-utils/src/trace_info_subprovider.ts | 6 +++---
 packages/sol-tracing-utils/src/types.ts                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/sol-profiler/src/cost_utils.ts b/packages/sol-profiler/src/cost_utils.ts
index a99023e379..7996f06805 100644
--- a/packages/sol-profiler/src/cost_utils.ts
+++ b/packages/sol-profiler/src/cost_utils.ts
@@ -14,11 +14,11 @@ const G_COPY = 3;
 
 export const costUtils = {
     reportCallDataCost(traceInfo: TraceInfo): number {
-        if (_.isUndefined(traceInfo.data)) {
+        if (_.isUndefined(traceInfo.dataIfExists)) {
             // No call data to report
             return 0;
         }
-        const callData = traceInfo.data;
+        const callData = traceInfo.dataIfExists;
         const callDataBuf = Buffer.from(stripHexPrefix(callData), 'hex');
         const { true: zeroBytesCountIfExist, false: nonZeroBytesCountIfExist } = _.countBy(
             callDataBuf,
diff --git a/packages/sol-tracing-utils/src/trace_info_subprovider.ts b/packages/sol-tracing-utils/src/trace_info_subprovider.ts
index 30444817ee..4ef9b87f92 100644
--- a/packages/sol-tracing-utils/src/trace_info_subprovider.ts
+++ b/packages/sol-tracing-utils/src/trace_info_subprovider.ts
@@ -15,7 +15,7 @@ export abstract class TraceInfoSubprovider extends TraceCollectionSubprovider {
     protected async _handleTraceInfoAsync(_traceInfo: TraceInfo): Promise<void> {
         return Promise.resolve(undefined);
     }
-    protected async _recordTxTraceAsync(address: string, data: string | undefined, txHash: string): Promise<void> {
+    protected async _recordTxTraceAsync(address: string, dataIfExists: string | undefined, txHash: string): Promise<void> {
         await this._web3Wrapper.awaitTransactionMinedAsync(txHash, 0);
         const nodeType = await this._web3Wrapper.getNodeTypeAsync();
         let trace;
@@ -73,7 +73,7 @@ export abstract class TraceInfoSubprovider extends TraceCollectionSubprovider {
         const traceInfo = {
             trace,
             address,
-            data,
+            dataIfExists,
             txHash,
         };
         await this._handleTraceInfoAsync(traceInfo);
@@ -90,7 +90,7 @@ export abstract class TraceInfoSubprovider extends TraceCollectionSubprovider {
                         subtrace: traceForThatSubcall,
                         txHash,
                         address: subcallAddress,
-                        bytecode: data as string,
+                        bytecode: dataIfExists as string,
                     };
                 } else {
                     const runtimeBytecode = await this._web3Wrapper.getContractCodeAsync(subcallAddress);
diff --git a/packages/sol-tracing-utils/src/types.ts b/packages/sol-tracing-utils/src/types.ts
index 0266d20b69..8842b63312 100644
--- a/packages/sol-tracing-utils/src/types.ts
+++ b/packages/sol-tracing-utils/src/types.ts
@@ -117,7 +117,7 @@ export interface TraceInfo {
     trace: TransactionTrace;
     txHash: string;
     address: string;
-    data: string | undefined;
+    dataIfExists: string | undefined;
 }
 
 export enum BlockParamLiteral {