aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/utils
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-05-24 01:19:10 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-05-24 01:19:10 +0800
commit0a725415a48ebc2f23578baa410f56f88bc77cee (patch)
treec4a618bb0700560d23b7839b60ba2203e46433f9 /packages/contracts/test/utils
parent48e66954470ffb1b547e377d3edbed5d2cf7fc6b (diff)
parentaf0d9439d4f4e05fce8018665e375cf2db07184c (diff)
downloaddexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar
dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.gz
dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.bz2
dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.lz
dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.xz
dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.zst
dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.zip
Merge branch 'v2-prototype' into feature/truffle-sol-cov
Diffstat (limited to 'packages/contracts/test/utils')
-rw-r--r--packages/contracts/test/utils/match_order_tester.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/test/utils/match_order_tester.ts b/packages/contracts/test/utils/match_order_tester.ts
index ae874e502..43196728c 100644
--- a/packages/contracts/test/utils/match_order_tester.ts
+++ b/packages/contracts/test/utils/match_order_tester.ts
@@ -1,5 +1,5 @@
-import { LogWithDecodedArgs, ZeroEx } from '0x.js';
import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { LogWithDecodedArgs } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import ethUtil = require('ethereumjs-util');