aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/match_orders.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-25 07:30:30 +0800
committerFabio Berger <me@fabioberger.com>2018-05-25 07:30:30 +0800
commit35121f0b780102f0235ab3d5f26441cbb3f090e9 (patch)
tree9f1e56a98683fbee69a6b5fc051dc81064643734 /packages/contracts/test/exchange/match_orders.ts
parent3cc8af819c9f62f42e7cb3d03f896b35cfc10d05 (diff)
parentc4a7574f7bd3939eac9417241144197bbb22edb1 (diff)
downloaddexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.gz
dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.zst
dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.zip
Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash
* v2-prototype: Temporarily disable installation tests Pin connect in sra-report Fix a typo Pin types in sra-report Fix linter issues Unpin types version in @0xproject/connect Pin types version in website Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages Migrate migrations to v2 # Conflicts: # packages/contracts/src/utils/order_utils.ts
Diffstat (limited to 'packages/contracts/test/exchange/match_orders.ts')
-rw-r--r--packages/contracts/test/exchange/match_orders.ts3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/contracts/test/exchange/match_orders.ts b/packages/contracts/test/exchange/match_orders.ts
index 1834e929c..0da0287bc 100644
--- a/packages/contracts/test/exchange/match_orders.ts
+++ b/packages/contracts/test/exchange/match_orders.ts
@@ -1,5 +1,5 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
-import { LogWithDecodedArgs } from '@0xproject/types';
+import { LogWithDecodedArgs, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
@@ -33,7 +33,6 @@ import {
ERC721TokenIdsByOwner,
ExchangeStatus,
OrderInfo,
- SignedOrder,
} from '../../src/utils/types';
import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper';