aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2017-06-22 22:21:56 +0800
committerGitHub <noreply@github.com>2017-06-22 22:21:56 +0800
commit94cab6f694027d47971d661bca33beac42f4ade1 (patch)
treec411ec567878a8178aa64313bd9b76dfcb455fc7 /src/utils
parent25a9ba90f508e0d147c060f60a9e3683e07d45e4 (diff)
downloaddexon-sol-tools-94cab6f694027d47971d661bca33beac42f4ade1.tar
dexon-sol-tools-94cab6f694027d47971d661bca33beac42f4ade1.tar.gz
dexon-sol-tools-94cab6f694027d47971d661bca33beac42f4ade1.tar.bz2
dexon-sol-tools-94cab6f694027d47971d661bca33beac42f4ade1.tar.lz
dexon-sol-tools-94cab6f694027d47971d661bca33beac42f4ade1.tar.xz
dexon-sol-tools-94cab6f694027d47971d661bca33beac42f4ade1.tar.zst
dexon-sol-tools-94cab6f694027d47971d661bca33beac42f4ade1.zip
Revert "Use different lodash import syntax which allows to include only used functions"
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/assert.ts24
-rw-r--r--src/utils/decorators.ts6
-rw-r--r--src/utils/utils.ts9
3 files changed, 16 insertions, 23 deletions
diff --git a/src/utils/assert.ts b/src/utils/assert.ts
index efc7ed366..94b119d5a 100644
--- a/src/utils/assert.ts
+++ b/src/utils/assert.ts
@@ -1,10 +1,4 @@
-import uniq = require('lodash/uniq');
-import isEmpty = require('lodash/isEmpty');
-import isObject = require('lodash/isObject');
-import isFinite = require('lodash/isFinite');
-import isString = require('lodash/isString');
-import isBoolean = require('lodash/isBoolean');
-import isUndefined = require('lodash/isUndefined');
+import * as _ from 'lodash';
import * as BigNumber from 'bignumber.js';
import * as Web3 from 'web3';
import {Web3Wrapper} from '../web3_wrapper';
@@ -15,17 +9,17 @@ const HEX_REGEX = /^0x[0-9A-F]*$/i;
export const assert = {
isBigNumber(variableName: string, value: BigNumber.BigNumber): void {
- const isBigNumber = isObject(value) && value.isBigNumber;
+ const isBigNumber = _.isObject(value) && value.isBigNumber;
this.assert(isBigNumber, this.typeAssertionMessage(variableName, 'BigNumber', value));
},
isUndefined(value: any, variableName?: string): void {
- this.assert(isUndefined(value), this.typeAssertionMessage(variableName, 'undefined', value));
+ this.assert(_.isUndefined(value), this.typeAssertionMessage(variableName, 'undefined', value));
},
isString(variableName: string, value: string): void {
- this.assert(isString(value), this.typeAssertionMessage(variableName, 'string', value));
+ this.assert(_.isString(value), this.typeAssertionMessage(variableName, 'string', value));
},
isHexString(variableName: string, value: string): void {
- this.assert(isString(value) && HEX_REGEX.test(value),
+ this.assert(_.isString(value) && HEX_REGEX.test(value),
this.typeAssertionMessage(variableName, 'HexString', value));
},
isETHAddressHex(variableName: string, value: string): void {
@@ -42,19 +36,19 @@ export const assert = {
},
async isUserAddressAvailableAsync(web3Wrapper: Web3Wrapper): Promise<void> {
const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
- this.assert(!isEmpty(availableAddresses), 'No addresses were available on the provided web3 instance');
+ this.assert(!_.isEmpty(availableAddresses), 'No addresses were available on the provided web3 instance');
},
hasAtMostOneUniqueValue(value: any[], errMsg: string): void {
- this.assert(uniq(value).length <= 1, errMsg);
+ this.assert(_.uniq(value).length <= 1, errMsg);
},
isNumber(variableName: string, value: number): void {
- this.assert(isFinite(value), this.typeAssertionMessage(variableName, 'number', value));
+ this.assert(_.isFinite(value), this.typeAssertionMessage(variableName, 'number', value));
},
isValidOrderHash(variableName: string, value: string): void {
this.assert(utils.isValidOrderHash(value), this.typeAssertionMessage(variableName, 'orderHash', value));
},
isBoolean(variableName: string, value: boolean): void {
- this.assert(isBoolean(value), this.typeAssertionMessage(variableName, 'boolean', value));
+ this.assert(_.isBoolean(value), this.typeAssertionMessage(variableName, 'boolean', value));
},
doesConformToSchema(variableName: string, value: object, schema: Schema): void {
const schemaValidator = new SchemaValidator();
diff --git a/src/utils/decorators.ts b/src/utils/decorators.ts
index b06e96747..a25f2cff5 100644
--- a/src/utils/decorators.ts
+++ b/src/utils/decorators.ts
@@ -1,4 +1,4 @@
-import includes = require('lodash/includes');
+import * as _ from 'lodash';
import {constants} from './constants';
import {AsyncMethod, ZeroExError} from '../types';
@@ -20,10 +20,10 @@ export const decorators = {
const result = await originalMethod.apply(this, args);
return result;
} catch (error) {
- if (includes(error.message, constants.INVALID_JUMP_PATTERN)) {
+ if (_.includes(error.message, constants.INVALID_JUMP_PATTERN)) {
throw new Error(ZeroExError.INVALID_JUMP);
}
- if (includes(error.message, constants.OUT_OF_GAS_PATTERN)) {
+ if (_.includes(error.message, constants.OUT_OF_GAS_PATTERN)) {
throw new Error(ZeroExError.OUT_OF_GAS);
}
throw error;
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 2db611ccb..bad5b6498 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,5 +1,4 @@
-import map = require('lodash/map');
-import includes = require('lodash/includes');
+import * as _ from 'lodash';
import * as BN from 'bn.js';
import * as ethABI from 'ethereumjs-abi';
import * as ethUtil from 'ethereumjs-util';
@@ -21,7 +20,7 @@ export const utils = {
console.log(message);
},
isParityNode(nodeVersion: string): boolean {
- return includes(nodeVersion, 'Parity');
+ return _.includes(nodeVersion, 'Parity');
},
isValidOrderHash(orderHashHex: string): boolean {
const isValid = /^0x[0-9A-F]{64}$/i.test(orderHashHex);
@@ -45,8 +44,8 @@ export const utils = {
{value: utils.bigNumberToBN(order.expirationUnixTimestampSec), type: SolidityTypes.uint256},
{value: utils.bigNumberToBN(order.salt), type: SolidityTypes.uint256},
];
- const types = map(orderParts, o => o.type);
- const values = map(orderParts, o => o.value);
+ const types = _.map(orderParts, o => o.type);
+ const values = _.map(orderParts, o => o.value);
const hashBuff = ethABI.soliditySHA3(types, values);
const hashHex = ethUtil.bufferToHex(hashBuff);
return hashHex;