From 839db68571037f6fff8273aaade6ea0bd14ea8a5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 16 May 2018 14:59:10 +0200
Subject: Fix TSLint rules

---
 packages/utils/src/abi_decoder.ts    | 12 +++++++-----
 packages/utils/src/address_utils.ts  | 11 ++++++++---
 packages/utils/src/interval_utils.ts |  8 ++++----
 3 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'packages/utils')

diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index d329f917a..654c7753b 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -23,7 +23,8 @@ export class AbiDecoder {
             formatted = formatted.slice(2);
         }
 
-        formatted = _.padStart(formatted, 40, '0');
+        const desiredLength = 40;
+        formatted = _.padStart(formatted, desiredLength, '0');
         return `0x${formatted}`;
     }
     constructor(abiArrays: AbiDefinition[][]) {
@@ -45,16 +46,17 @@ export class AbiDecoder {
         const dataTypes = _.map(nonIndexedInputs, input => input.type);
         const decodedData = ethersInterface.events[event.name].parse(log.data);
 
-        let failedToDecode = false;
+        let didFailToDecode = false;
         _.forEach(event.inputs, (param: EventParameter, i: number) => {
             // Indexed parameters are stored in topics. Non-indexed ones in decodedData
             let value: BigNumber | string | number = param.indexed ? log.topics[topicsIndex++] : decodedData[i];
             if (_.isUndefined(value)) {
-                failedToDecode = true;
+                didFailToDecode = true;
                 return;
             }
             if (param.type === SolidityTypes.Address) {
-                value = AbiDecoder._padZeros(new BigNumber(value).toString(16));
+                const baseHex = 16;
+                value = AbiDecoder._padZeros(new BigNumber(value).toString(baseHex));
             } else if (param.type === SolidityTypes.Uint256 || param.type === SolidityTypes.Uint) {
                 value = new BigNumber(value);
             } else if (param.type === SolidityTypes.Uint8) {
@@ -63,7 +65,7 @@ export class AbiDecoder {
             decodedParams[param.name] = value;
         });
 
-        if (failedToDecode) {
+        if (didFailToDecode) {
             return log;
         } else {
             return {
diff --git a/packages/utils/src/address_utils.ts b/packages/utils/src/address_utils.ts
index f94985441..e25bde249 100644
--- a/packages/utils/src/address_utils.ts
+++ b/packages/utils/src/address_utils.ts
@@ -9,11 +9,16 @@ export const addressUtils = {
         const unprefixedAddress = address.replace('0x', '');
         const addressHash = jsSHA3.keccak256(unprefixedAddress.toLowerCase());
 
-        for (let i = 0; i < 40; i++) {
+        const addressLength = 40;
+        for (let i = 0; i < addressLength; i++) {
             // The nth letter should be uppercase if the nth digit of casemap is 1
+            const hexBase = 16;
+            const lowercaseRange = 7;
             if (
-                (parseInt(addressHash[i], 16) > 7 && unprefixedAddress[i].toUpperCase() !== unprefixedAddress[i]) ||
-                (parseInt(addressHash[i], 16) <= 7 && unprefixedAddress[i].toLowerCase() !== unprefixedAddress[i])
+                (parseInt(addressHash[i], hexBase) > lowercaseRange &&
+                    unprefixedAddress[i].toUpperCase() !== unprefixedAddress[i]) ||
+                (parseInt(addressHash[i], hexBase) <= lowercaseRange &&
+                    unprefixedAddress[i].toLowerCase() !== unprefixedAddress[i])
             ) {
                 return false;
             }
diff --git a/packages/utils/src/interval_utils.ts b/packages/utils/src/interval_utils.ts
index 6984bf42d..6784d5b35 100644
--- a/packages/utils/src/interval_utils.ts
+++ b/packages/utils/src/interval_utils.ts
@@ -6,18 +6,18 @@ export const intervalUtils = {
         intervalMs: number,
         onError: (err: Error) => void,
     ): NodeJS.Timer {
-        let locked = false;
+        let isLocked = false;
         const intervalId = setInterval(async () => {
-            if (locked) {
+            if (isLocked) {
                 return;
             } else {
-                locked = true;
+                isLocked = true;
                 try {
                     await fn();
                 } catch (err) {
                     onError(err);
                 }
-                locked = false;
+                isLocked = false;
             }
         }, intervalMs);
         return intervalId;
-- 
cgit v1.2.3


From 7fab7829071f5b60a6dad058c5a7b6d56f607b97 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 17 May 2018 14:07:55 +0200
Subject: Improve naming

---
 packages/utils/src/abi_decoder.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/utils')

diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index 654c7753b..c78bfa343 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -23,8 +23,8 @@ export class AbiDecoder {
             formatted = formatted.slice(2);
         }
 
-        const desiredLength = 40;
-        formatted = _.padStart(formatted, desiredLength, '0');
+        const addressLength = 40;
+        formatted = _.padStart(formatted, addressLength, '0');
         return `0x${formatted}`;
     }
     constructor(abiArrays: AbiDefinition[][]) {
-- 
cgit v1.2.3