aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2017-06-22 22:22:20 +0800
committerGitHub <noreply@github.com>2017-06-22 22:22:20 +0800
commit1375126e4cec43714fdd7bf17a0a5d7301bf7928 (patch)
treec411ec567878a8178aa64313bd9b76dfcb455fc7 /test
parent25a9ba90f508e0d147c060f60a9e3683e07d45e4 (diff)
parent94cab6f694027d47971d661bca33beac42f4ade1 (diff)
downloaddexon-sol-tools-1375126e4cec43714fdd7bf17a0a5d7301bf7928.tar
dexon-sol-tools-1375126e4cec43714fdd7bf17a0a5d7301bf7928.tar.gz
dexon-sol-tools-1375126e4cec43714fdd7bf17a0a5d7301bf7928.tar.bz2
dexon-sol-tools-1375126e4cec43714fdd7bf17a0a5d7301bf7928.tar.lz
dexon-sol-tools-1375126e4cec43714fdd7bf17a0a5d7301bf7928.tar.xz
dexon-sol-tools-1375126e4cec43714fdd7bf17a0a5d7301bf7928.tar.zst
dexon-sol-tools-1375126e4cec43714fdd7bf17a0a5d7301bf7928.zip
Merge pull request #77 from 0xProject/revert-71-lodash-tree-shake
Revert "Use different lodash import syntax which allows to include only used functions"
Diffstat (limited to 'test')
-rw-r--r--test/0x.js_test.ts9
-rw-r--r--test/schema_test.ts6
-rw-r--r--test/token_registry_wrapper_test.ts4
-rw-r--r--test/utils/order_factory.ts7
-rw-r--r--test/utils/token_utils.ts10
5 files changed, 16 insertions, 20 deletions
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index e50a6018c..9ec0a0c8e 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -1,5 +1,4 @@
-import each = require('lodash/each');
-import assign = require('lodash/assign');
+import * as _ from 'lodash';
import * as chai from 'chai';
import {chaiSetup} from './utils/chai_setup';
import 'mocha';
@@ -68,7 +67,7 @@ describe('ZeroEx library', () => {
).to.become(false);
});
it('should return false if the signature doesn\'t pertain to the dataHex & address', async () => {
- const wrongSignature = assign({}, signature, {v: 28});
+ const wrongSignature = _.assign({}, signature, {v: 28});
expect(ZeroEx.isValidSignature(dataHex, wrongSignature, address)).to.be.false();
return expect(
(zeroEx.exchange as any)._isValidSignatureUsingContractCallAsync(dataHex, wrongSignature, address),
@@ -145,7 +144,7 @@ describe('ZeroEx library', () => {
let stubs: Sinon.SinonStub[] = [];
afterEach(() => {
// clean up any stubs after the test has completed
- each(stubs, s => s.restore());
+ _.each(stubs, s => s.restore());
stubs = [];
});
it('calculates the order hash', async () => {
@@ -172,7 +171,7 @@ describe('ZeroEx library', () => {
});
afterEach(() => {
// clean up any stubs after the test has completed
- each(stubs, s => s.restore());
+ _.each(stubs, s => s.restore());
stubs = [];
});
it ('Should return the correct ECSignature on TestPRC nodeVersion', async () => {
diff --git a/test/schema_test.ts b/test/schema_test.ts
index 72b08581a..b251a68f9 100644
--- a/test/schema_test.ts
+++ b/test/schema_test.ts
@@ -1,5 +1,5 @@
import 'mocha';
-import forEach = require('lodash/forEach');
+import * as _ from 'lodash';
import * as chai from 'chai';
import * as BigNumber from 'bignumber.js';
import promisify = require('es6-promisify');
@@ -19,7 +19,7 @@ const expect = chai.expect;
describe('Schema', () => {
const validator = new SchemaValidator();
const validateAgainstSchema = (testCases: any[], schema: any, shouldFail = false) => {
- forEach(testCases, (testCase: any) => {
+ _.forEach(testCases, (testCase: any) => {
if (shouldFail) {
expect(validator.validate(testCase, schema).errors).to.be.lengthOf.at.least(1);
} else {
@@ -285,7 +285,7 @@ describe('Schema', () => {
'00.00': '0',
'.3': '0.3',
};
- forEach(testCases, (serialized: string, input: string) => {
+ _.forEach(testCases, (serialized: string, input: string) => {
expect(JSON.parse(JSON.stringify(new BigNumber(input)))).to.be.equal(serialized);
});
});
diff --git a/test/token_registry_wrapper_test.ts b/test/token_registry_wrapper_test.ts
index d7c8a7a95..da436161c 100644
--- a/test/token_registry_wrapper_test.ts
+++ b/test/token_registry_wrapper_test.ts
@@ -1,4 +1,4 @@
-import each = require('lodash/each');
+import * as _ from 'lodash';
import 'mocha';
import * as chai from 'chai';
import {chaiSetup} from './utils/chai_setup';
@@ -32,7 +32,7 @@ describe('TokenRegistryWrapper', () => {
expect(tokens).to.have.lengthOf(TOKEN_REGISTRY_SIZE_AFTER_MIGRATION);
const schemaValidator = new SchemaValidator();
- each(tokens, token => {
+ _.each(tokens, token => {
const validationResult = schemaValidator.validate(token, tokenSchema);
expect(validationResult.errors).to.have.lengthOf(0);
});
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<SignedOrder> {
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;