Merge branch 'v2-prototype' into feature/order-watcher-v2

2 files changed, 4 insertions, 4 deletions

diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index b75387e3e..7f93e746e 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -16,7 +16,7 @@ import { addressUtils } from './address_utils';
 import { BigNumber } from './configured_bignumber';
 
 export class AbiDecoder {
-    private _methodIds: { [signatureHash: string]: EventAbi } = {};
+    private readonly _methodIds: { [signatureHash: string]: EventAbi } = {};
     constructor(abiArrays: AbiDefinition[][]) {
         _.forEach(abiArrays, this.addABI.bind(this));
     }
diff --git a/packages/utils/src/abi_utils.ts b/packages/utils/src/abi_utils.ts
index 413c2f481..421dd405c 100644
--- a/packages/utils/src/abi_utils.ts
+++ b/packages/utils/src/abi_utils.ts
@@ -6,7 +6,7 @@ export const abiUtils = {
         if (param.type === 'tuple') {
             // Parse out tuple types into {type_1, type_2, ..., type_N}
             const tupleComponents = param.components;
-            const paramString = _.map(tupleComponents, component => this.parseFunctionParam(component));
+            const paramString = _.map(tupleComponents, component => abiUtils.parseFunctionParam(component));
             const tupleParamString = `{${paramString}}`;
             return tupleParamString;
         }
@@ -14,7 +14,7 @@ export const abiUtils = {
     },
     getFunctionSignature(methodAbi: MethodAbi): string {
         const functionName = methodAbi.name;
-        const parameterTypeList = _.map(methodAbi.inputs, (param: DataItem) => this.parseFunctionParam(param));
+        const parameterTypeList = _.map(methodAbi.inputs, (param: DataItem) => abiUtils.parseFunctionParam(param));
         const functionSignature = `${functionName}(${parameterTypeList})`;
         return functionSignature;
     },
@@ -37,7 +37,7 @@ export const abiUtils = {
         // Sort method Abis into alphabetical order, by function signature
         const methodAbisOrdered = _.sortBy(methodAbis, [
             (methodAbi: MethodAbi) => {
-                const functionSignature = this.getFunctionSignature(methodAbi);
+                const functionSignature = abiUtils.getFunctionSignature(methodAbi);
                 return functionSignature;
             },
         ]);