diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-25 07:18:44 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-25 07:18:44 +0800 |
commit | c4a7574f7bd3939eac9417241144197bbb22edb1 (patch) | |
tree | 4f2d13872c3c8063373a56d1112c3f3ceb27f733 /packages/contracts/src/utils/order_utils.ts | |
parent | 4ee636ecca20d2744a7d133194aa950f3f6fb833 (diff) | |
parent | 3e907d7f4fddcb9ae5438b5676bf9ecd99007909 (diff) | |
download | dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.gz dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.bz2 dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.lz dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.xz dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.zst dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.zip |
Merge pull request #618 from 0xProject/feature/v2-migrations
Migrate migrations, types to v2
Diffstat (limited to 'packages/contracts/src/utils/order_utils.ts')
-rw-r--r-- | packages/contracts/src/utils/order_utils.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/contracts/src/utils/order_utils.ts b/packages/contracts/src/utils/order_utils.ts index 8adc6b735..9542a3858 100644 --- a/packages/contracts/src/utils/order_utils.ts +++ b/packages/contracts/src/utils/order_utils.ts @@ -1,10 +1,11 @@ +import { Order, SignedOrder, UnsignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import ethUtil = require('ethereumjs-util'); import * as _ from 'lodash'; import { crypto } from './crypto'; -import { CancelOrder, MatchOrder, OrderStruct, SignatureType, SignedOrder, UnsignedOrder } from './types'; +import { CancelOrder, MatchOrder, SignatureType } from './types'; export const orderUtils = { createFill: (signedOrder: SignedOrder, takerAssetFillAmount?: BigNumber) => { @@ -22,7 +23,7 @@ export const orderUtils = { }; return cancel; }, - getOrderStruct(signedOrder: SignedOrder): OrderStruct { + getOrderStruct(signedOrder: SignedOrder): Order { const orderStruct = { senderAddress: signedOrder.senderAddress, makerAddress: signedOrder.makerAddress, |