From 94cab6f694027d47971d661bca33beac42f4ade1 Mon Sep 17 00:00:00 2001 From: Leonid Date: Thu, 22 Jun 2017 16:21:56 +0200 Subject: Revert "Use different lodash import syntax which allows to include only used functions" --- test/utils/order_factory.ts | 7 +++---- test/utils/token_utils.ts | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'test/utils') diff --git a/test/utils/order_factory.ts b/test/utils/order_factory.ts index 939d5df20..ef19f2c4c 100644 --- a/test/utils/order_factory.ts +++ b/test/utils/order_factory.ts @@ -1,5 +1,4 @@ -import assign = require('lodash/assign'); -import isUndefined = require('lodash/isUndefined'); +import * as _ from 'lodash'; import * as BigNumber from 'bignumber.js'; import {ZeroEx, SignedOrder} from '../../src'; @@ -17,7 +16,7 @@ export const orderFactory = { feeRecipient: string, expirationUnixTimestampSec?: BigNumber.BigNumber): Promise { const defaultExpirationUnixTimestampSec = new BigNumber(2524604400); // Close to infinite - expirationUnixTimestampSec = isUndefined(expirationUnixTimestampSec) ? + expirationUnixTimestampSec = _.isUndefined(expirationUnixTimestampSec) ? defaultExpirationUnixTimestampSec : expirationUnixTimestampSec; const order = { @@ -35,7 +34,7 @@ export const orderFactory = { }; const orderHash = await zeroEx.getOrderHashHexAsync(order); const ecSignature = await zeroEx.signOrderHashAsync(orderHash, maker); - const signedOrder: SignedOrder = assign(order, {ecSignature}); + const signedOrder: SignedOrder = _.assign(order, {ecSignature}); return signedOrder; }, }; diff --git a/test/utils/token_utils.ts b/test/utils/token_utils.ts index 00fa55260..f4fa7ac31 100644 --- a/test/utils/token_utils.ts +++ b/test/utils/token_utils.ts @@ -1,6 +1,4 @@ -import find = require('lodash/find'); -import filter = require('lodash/filter'); -import isUndefined = require('lodash/isUndefined'); +import * as _ from 'lodash'; import {Token, ZeroExError} from '../../src'; const PROTOCOL_TOKEN_SYMBOL = 'ZRX'; @@ -11,14 +9,14 @@ export class TokenUtils { this.tokens = tokens; } public getProtocolTokenOrThrow(): Token { - const zrxToken = find(this.tokens, {symbol: PROTOCOL_TOKEN_SYMBOL}); - if (isUndefined(zrxToken)) { + const zrxToken = _.find(this.tokens, {symbol: PROTOCOL_TOKEN_SYMBOL}); + if (_.isUndefined(zrxToken)) { throw new Error(ZeroExError.ZRX_NOT_IN_TOKEN_REGISTRY); } return zrxToken; } public getNonProtocolTokens(): Token[] { - const nonProtocolTokens = filter(this.tokens, token => { + const nonProtocolTokens = _.filter(this.tokens, token => { return token.symbol !== PROTOCOL_TOKEN_SYMBOL; }); return nonProtocolTokens; -- cgit v1.2.3