From 029b8d59507df25aa9c7d1b096c8d873eb6ae4da Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Tue, 27 Nov 2018 17:11:15 -0800
Subject: Changed constants to an exported enum; this is 0x convention

---
 packages/utils/src/abi_encoder/calldata/blocks/pointer.ts |  6 +++---
 packages/utils/src/abi_encoder/calldata/calldata.ts       | 14 +++++++-------
 packages/utils/src/abi_encoder/calldata/raw_calldata.ts   |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages/utils/src/abi_encoder/calldata')

diff --git a/packages/utils/src/abi_encoder/calldata/blocks/pointer.ts b/packages/utils/src/abi_encoder/calldata/blocks/pointer.ts
index 654cbe26c..1daf33f7e 100644
--- a/packages/utils/src/abi_encoder/calldata/blocks/pointer.ts
+++ b/packages/utils/src/abi_encoder/calldata/blocks/pointer.ts
@@ -1,7 +1,7 @@
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
-import * as Constants from '../../utils/constants';
+import { constants } from '../../utils/constants';
 
 import { CalldataBlock } from '../calldata_block';
 
@@ -29,9 +29,9 @@ export class Pointer extends CalldataBlock {
         const parentOffset = this._parent.getOffsetInBytes();
         const parentHeaderSize = this._parent.getHeaderSizeInBytes();
         const pointer: number = destinationOffset - (parentOffset + parentHeaderSize);
-        const pointerHex = `0x${pointer.toString(Constants.HEX_BASE)}`;
+        const pointerHex = `0x${pointer.toString(constants.HEX_BASE)}`;
         const pointerBuf = ethUtil.toBuffer(pointerHex);
-        const pointerBufPadded = ethUtil.setLengthLeft(pointerBuf, Constants.EVM_WORD_WIDTH_IN_BYTES);
+        const pointerBufPadded = ethUtil.setLengthLeft(pointerBuf, constants.EVM_WORD_WIDTH_IN_BYTES);
         return pointerBufPadded;
     }
 
diff --git a/packages/utils/src/abi_encoder/calldata/calldata.ts b/packages/utils/src/abi_encoder/calldata/calldata.ts
index 6d8814e06..e5858b524 100644
--- a/packages/utils/src/abi_encoder/calldata/calldata.ts
+++ b/packages/utils/src/abi_encoder/calldata/calldata.ts
@@ -1,7 +1,7 @@
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
-import * as Constants from '../utils/constants';
+import { constants } from '../utils/constants';
 import { EncodingRules } from '../utils/rules';
 
 import * as CalldataBlocks from './blocks';
@@ -31,7 +31,7 @@ export class Calldata {
     public setSelector(selector: string): void {
         if (!_.startsWith(selector, '0x')) {
             throw new Error(`Expected selector to be hex. Missing prefix '0x'`);
-        } else if (selector.length !== Constants.HEX_SELECTOR_LENGTH_IN_CHARS) {
+        } else if (selector.length !== constants.HEX_SELECTOR_LENGTH_IN_CHARS) {
             throw new Error(`Invalid selector '${selector}'`);
         }
         this._selector = selector;
@@ -206,11 +206,11 @@ export class Calldata {
                 lineStr = `\n${offsetStr}${valueStr}${nameStr}`;
             } else {
                 // This block has at least one word of value.
-                offsetStr = `0x${offset.toString(Constants.HEX_BASE)}`.padEnd(offsetPadding);
+                offsetStr = `0x${offset.toString(constants.HEX_BASE)}`.padEnd(offsetPadding);
                 valueStr = ethUtil
                     .stripHexPrefix(
                         ethUtil.bufferToHex(
-                            block.toBuffer().slice(evmWordStartIndex, Constants.EVM_WORD_WIDTH_IN_BYTES),
+                            block.toBuffer().slice(evmWordStartIndex, constants.EVM_WORD_WIDTH_IN_BYTES),
                         ),
                     )
                     .padEnd(valuePadding);
@@ -223,11 +223,11 @@ export class Calldata {
                 }
             }
             // This block has a value that is more than 1 word.
-            for (let j = Constants.EVM_WORD_WIDTH_IN_BYTES; j < size; j += Constants.EVM_WORD_WIDTH_IN_BYTES) {
-                offsetStr = `0x${(offset + j).toString(Constants.HEX_BASE)}`.padEnd(offsetPadding);
+            for (let j = constants.EVM_WORD_WIDTH_IN_BYTES; j < size; j += constants.EVM_WORD_WIDTH_IN_BYTES) {
+                offsetStr = `0x${(offset + j).toString(constants.HEX_BASE)}`.padEnd(offsetPadding);
                 valueStr = ethUtil
                     .stripHexPrefix(
-                        ethUtil.bufferToHex(block.toBuffer().slice(j, j + Constants.EVM_WORD_WIDTH_IN_BYTES)),
+                        ethUtil.bufferToHex(block.toBuffer().slice(j, j + constants.EVM_WORD_WIDTH_IN_BYTES)),
                     )
                     .padEnd(valuePadding);
                 nameStr = ' '.repeat(namePadding);
diff --git a/packages/utils/src/abi_encoder/calldata/raw_calldata.ts b/packages/utils/src/abi_encoder/calldata/raw_calldata.ts
index fbe592fc7..189841989 100644
--- a/packages/utils/src/abi_encoder/calldata/raw_calldata.ts
+++ b/packages/utils/src/abi_encoder/calldata/raw_calldata.ts
@@ -1,7 +1,7 @@
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
-import * as Constants from '../utils/constants';
+import { constants } from '../utils/constants';
 import { Queue } from '../utils/queue';
 
 export class RawCalldata {
@@ -24,8 +24,8 @@ export class RawCalldata {
         this._offset = RawCalldata._INITIAL_OFFSET;
         // If there's a selector then slice it
         if (hasSelector) {
-            const selectorBuf = this._value.slice(Constants.HEX_SELECTOR_LENGTH_IN_BYTES);
-            this._value = this._value.slice(Constants.HEX_SELECTOR_LENGTH_IN_BYTES);
+            const selectorBuf = this._value.slice(constants.HEX_SELECTOR_LENGTH_IN_BYTES);
+            this._value = this._value.slice(constants.HEX_SELECTOR_LENGTH_IN_BYTES);
             this._selector = ethUtil.bufferToHex(selectorBuf);
         }
     }
-- 
cgit v1.2.3