aboutsummaryrefslogtreecommitdiffstats
path: root/packages/utils/src/abi_encoder/abstract_data_types/types
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-11-28 09:11:15 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-11-29 08:38:11 +0800
commit029b8d59507df25aa9c7d1b096c8d873eb6ae4da (patch)
treee95e60341f55da870fee30e1fb9aa98d201125c4 /packages/utils/src/abi_encoder/abstract_data_types/types
parent14c094d050e7b2d0a4b31d02dbe58a54153be7bb (diff)
downloaddexon-sol-tools-029b8d59507df25aa9c7d1b096c8d873eb6ae4da.tar
dexon-sol-tools-029b8d59507df25aa9c7d1b096c8d873eb6ae4da.tar.gz
dexon-sol-tools-029b8d59507df25aa9c7d1b096c8d873eb6ae4da.tar.bz2
dexon-sol-tools-029b8d59507df25aa9c7d1b096c8d873eb6ae4da.tar.lz
dexon-sol-tools-029b8d59507df25aa9c7d1b096c8d873eb6ae4da.tar.xz
dexon-sol-tools-029b8d59507df25aa9c7d1b096c8d873eb6ae4da.tar.zst
dexon-sol-tools-029b8d59507df25aa9c7d1b096c8d873eb6ae4da.zip
Changed constants to an exported enum; this is 0x convention
Diffstat (limited to 'packages/utils/src/abi_encoder/abstract_data_types/types')
-rw-r--r--packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts4
-rw-r--r--packages/utils/src/abi_encoder/abstract_data_types/types/set.ts12
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts b/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts
index 8e597636b..3d38deb94 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts
@@ -3,7 +3,7 @@ import * as ethUtil from 'ethereumjs-util';
import * as _ from 'lodash';
import { CalldataBlock, CalldataBlocks, RawCalldata } from '../../calldata';
-import * as Constants from '../../utils/constants';
+import { constants } from '../../utils/constants';
import { DecodingRules } from '../../utils/rules';
import { DataType } from '../data_type';
@@ -34,7 +34,7 @@ export abstract class Pointer extends DataType {
public generateValue(calldata: RawCalldata, rules: DecodingRules): any {
const destinationOffsetBuf = calldata.popWord();
const destinationOffsetHex = ethUtil.bufferToHex(destinationOffsetBuf);
- const destinationOffsetRelative = parseInt(destinationOffsetHex, Constants.HEX_BASE);
+ const destinationOffsetRelative = parseInt(destinationOffsetHex, constants.HEX_BASE);
const destinationOffsetAbsolute = calldata.toAbsoluteOffset(destinationOffsetRelative);
const currentOffset = calldata.getOffset();
calldata.setOffset(destinationOffsetAbsolute);
diff --git a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
index aeea7919f..f50ed8298 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash';
import { BigNumber } from '../../../configured_bignumber';
import { CalldataBlock, CalldataBlocks, RawCalldata } from '../../calldata';
-import * as Constants from '../../utils/constants';
+import { constants } from '../../utils/constants';
import { DecodingRules } from '../../utils/rules';
import { DataType } from '../data_type';
@@ -54,7 +54,7 @@ export abstract class Set extends DataType {
if (this._isArray && _.isUndefined(this._arrayLength)) {
const arrayLengthBuf = calldata.popWord();
const arrayLengthHex = ethUtil.bufferToHex(arrayLengthBuf);
- const arrayLength = new BigNumber(arrayLengthHex, Constants.HEX_BASE);
+ const arrayLength = new BigNumber(arrayLengthHex, constants.HEX_BASE);
[members] = this._createMembersWithLength(this.getDataItem(), arrayLength.toNumber());
}
// Create a new scope in the calldata, before descending into the members of this set.
@@ -115,8 +115,8 @@ export abstract class Set extends DataType {
if (this._isArray && _.isUndefined(this._arrayLength)) {
[members] = this._createMembersWithLength(this.getDataItem(), value.length);
const lenBuf = ethUtil.setLengthLeft(
- ethUtil.toBuffer(`0x${value.length.toString(Constants.HEX_BASE)}`),
- Constants.EVM_WORD_WIDTH_IN_BYTES,
+ ethUtil.toBuffer(`0x${value.length.toString(constants.HEX_BASE)}`),
+ constants.EVM_WORD_WIDTH_IN_BYTES,
);
block.setHeader(lenBuf);
}
@@ -205,14 +205,14 @@ export abstract class Set extends DataType {
_.each(range, (idx: number) => {
const memberDataItem: DataItem = {
type: _.isUndefined(this._arrayElementType) ? '' : this._arrayElementType,
- name: `${dataItem.name}[${idx.toString(Constants.DEC_BASE)}]`,
+ name: `${dataItem.name}[${idx.toString(constants.DEC_BASE)}]`,
};
const components = dataItem.components;
if (!_.isUndefined(components)) {
memberDataItem.components = components;
}
const memberType = this.getFactory().create(memberDataItem, this);
- memberIndexByName[idx.toString(Constants.DEC_BASE)] = members.length;
+ memberIndexByName[idx.toString(constants.DEC_BASE)] = members.length;
members.push(memberType);
});
return [members, memberIndexByName];