diff options
author | Fabio Berger <me@fabioberger.com> | 2018-05-25 07:31:21 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-05-25 07:31:21 +0800 |
commit | 4e5bfae332279acbb58d76a32102b5a27dde069d (patch) | |
tree | e613c1a5ebba642a171f0817ef8c336088091543 /packages/contracts/test/exchange/wrapper.ts | |
parent | 662dc1287737aa02c0c822d7c53be114230422c0 (diff) | |
parent | 895a9093aa5f204f9f7ad0fedb2934a8b6c40b17 (diff) | |
download | dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.gz dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.bz2 dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.lz dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.xz dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.zst dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.zip |
Merge branch 'v2-prototype' into refactor/order-utils/for-v2
* v2-prototype:
Temporarily disable installation tests
Use domain separator for exchange address
publicGetOrderSchemaHash -> getOrderSchemaHash
Update order hash to match latest eip712
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
Diffstat (limited to 'packages/contracts/test/exchange/wrapper.ts')
-rw-r--r-- | packages/contracts/test/exchange/wrapper.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts index e7217c2a7..7e1818f4a 100644 --- a/packages/contracts/test/exchange/wrapper.ts +++ b/packages/contracts/test/exchange/wrapper.ts @@ -1,4 +1,5 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils'; +import { SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; @@ -20,7 +21,7 @@ import { ERC20Wrapper } from '../../src/utils/erc20_wrapper'; import { ERC721Wrapper } from '../../src/utils/erc721_wrapper'; import { ExchangeWrapper } from '../../src/utils/exchange_wrapper'; import { OrderFactory } from '../../src/utils/order_factory'; -import { AssetProxyId, ERC20BalancesByOwner, SignedOrder } from '../../src/utils/types'; +import { AssetProxyId, ERC20BalancesByOwner } from '../../src/utils/types'; import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper'; chaiSetup.configure(); |