aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-22 04:38:12 +0800
committerFabio Berger <me@fabioberger.com>2018-05-22 04:38:12 +0800
commit0fdf32cf6f0f1def41a1733687e977feb3a652f5 (patch)
treeb62110db354e7e221548b6dd95215ffbf00573af /packages/contracts/test/exchange
parentc70540e7f4ead1f25d1436de3b4dcda06c3e1e68 (diff)
parenta26cc7c14d4e59102d5f84d534f75c42b8683cad (diff)
downloaddexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar
dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.gz
dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.bz2
dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.lz
dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.xz
dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.zst
dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.zip
merge development
Diffstat (limited to 'packages/contracts/test/exchange')
-rw-r--r--packages/contracts/test/exchange/core.ts2
-rw-r--r--packages/contracts/test/exchange/wrapper.ts1
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 6c190d4da..e8fb87efb 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -3,7 +3,7 @@ import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import ethUtil = require('ethereumjs-util');
-import * as _ from 'lodash';
+import 'make-promises-safe';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token';
import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token';
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index 44145b4f0..0b79308dd 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -4,6 +4,7 @@ import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
import * as _ from 'lodash';
+import 'make-promises-safe';
import * as Web3 from 'web3';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token';