aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2017-10-24 21:40:50 +0800
committerGitHub <noreply@github.com>2017-10-24 21:40:50 +0800
commit3deac0f100e85ff4a1df2363edc41cff40a40262 (patch)
treea2fa218dfd160986d39a2281a6748c325ebba2d1 /test
parentfab2fa9adfe95db0b6f203efb926d52b6c9e14d4 (diff)
parent641d3b75eadf8f3330d60ca26b7edc06a871219c (diff)
downloaddexon-sol-tools-3deac0f100e85ff4a1df2363edc41cff40a40262.tar
dexon-sol-tools-3deac0f100e85ff4a1df2363edc41cff40a40262.tar.gz
dexon-sol-tools-3deac0f100e85ff4a1df2363edc41cff40a40262.tar.bz2
dexon-sol-tools-3deac0f100e85ff4a1df2363edc41cff40a40262.tar.lz
dexon-sol-tools-3deac0f100e85ff4a1df2363edc41cff40a40262.tar.xz
dexon-sol-tools-3deac0f100e85ff4a1df2363edc41cff40a40262.tar.zst
dexon-sol-tools-3deac0f100e85ff4a1df2363edc41cff40a40262.zip
Merge pull request #198 from 0xProject/revert-195-minification
Revert "Reduce final bundle size by 11% (82kB)"
Diffstat (limited to 'test')
-rw-r--r--test/0x.js_test.ts2
-rw-r--r--test/exchange_wrapper_test.ts13
-rw-r--r--test/token_registry_wrapper_test.ts2
-rw-r--r--test/utils/order_factory.ts2
-rw-r--r--test/utils/token_utils.ts2
5 files changed, 9 insertions, 12 deletions
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index 0c1d1a68d..dd5dd19b1 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -1,4 +1,4 @@
-import {_} from '../src/utils/lodash';
+import * as _ from 'lodash';
import * as chai from 'chai';
import {chaiSetup} from './utils/chai_setup';
import 'mocha';
diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 2cfab2d65..f3f16643e 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -304,11 +304,11 @@ describe('ExchangeWrapper', () => {
orderFillBatch = [
{
signedOrder,
- takerTokenFillAmount,
+ takerTokenFillAmount: takerTokenFillAmount,
},
{
signedOrder: anotherSignedOrder,
- takerTokenFillAmount,
+ takerTokenFillAmount: takerTokenFillAmount,
},
];
});
@@ -655,8 +655,7 @@ describe('ExchangeWrapper', () => {
ExchangeEvents.LogFill, indexFilterValues, callback,
);
await zeroEx.exchange.fillOrderAsync(
- signedOrder, takerTokenFillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance,
- takerAddress,
+ signedOrder, takerTokenFillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance, takerAddress,
);
})().catch(done);
});
@@ -692,8 +691,7 @@ describe('ExchangeWrapper', () => {
ExchangeEvents.LogFill, indexFilterValues, callback,
);
await zeroEx.exchange.fillOrderAsync(
- signedOrder, takerTokenFillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance,
- takerAddress,
+ signedOrder, takerTokenFillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance, takerAddress,
);
})().catch(done);
});
@@ -707,8 +705,7 @@ describe('ExchangeWrapper', () => {
);
zeroEx.exchange.unsubscribe(subscriptionToken);
await zeroEx.exchange.fillOrderAsync(
- signedOrder, takerTokenFillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance,
- takerAddress,
+ signedOrder, takerTokenFillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance, takerAddress,
);
done();
})().catch(done);
diff --git a/test/token_registry_wrapper_test.ts b/test/token_registry_wrapper_test.ts
index b415ec1c6..6b5dd517e 100644
--- a/test/token_registry_wrapper_test.ts
+++ b/test/token_registry_wrapper_test.ts
@@ -1,4 +1,4 @@
-import {_} from '../src/utils/lodash';
+import * as _ from 'lodash';
import 'mocha';
import * as chai from 'chai';
import {SchemaValidator, schemas} from '0x-json-schemas';
diff --git a/test/utils/order_factory.ts b/test/utils/order_factory.ts
index 30a6f376a..fc4adebd9 100644
--- a/test/utils/order_factory.ts
+++ b/test/utils/order_factory.ts
@@ -1,4 +1,4 @@
-import {_} from '../../src/utils/lodash';
+import * as _ from 'lodash';
import * as BigNumber from 'bignumber.js';
import {ZeroEx, SignedOrder} from '../../src';
diff --git a/test/utils/token_utils.ts b/test/utils/token_utils.ts
index ab0682b32..51cb9411c 100644
--- a/test/utils/token_utils.ts
+++ b/test/utils/token_utils.ts
@@ -1,4 +1,4 @@
-import {_} from '../../src/utils/lodash';
+import * as _ from 'lodash';
import {Token, InternalZeroExError} from '../../src/types';
const PROTOCOL_TOKEN_SYMBOL = 'ZRX';