From b39f75a2e328bc48e99a705973a7b364f3866719 Mon Sep 17 00:00:00 2001
From: Remco Bloemen <remco@wicked.ventures>
Date: Tue, 22 May 2018 14:52:06 +0200
Subject: [PATCH] Add CancelOrder and MatchOrder types

---
 packages/contracts/src/utils/order_utils.ts |  6 +++---
 packages/contracts/src/utils/types.ts       | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/contracts/src/utils/order_utils.ts b/packages/contracts/src/utils/order_utils.ts
index 7a482ad9ec..8adc6b735b 100644
--- a/packages/contracts/src/utils/order_utils.ts
+++ b/packages/contracts/src/utils/order_utils.ts
@@ -4,7 +4,7 @@ import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
 import { crypto } from './crypto';
-import { OrderStruct, SignatureType, SignedOrder, UnsignedOrder } from './types';
+import { CancelOrder, MatchOrder, OrderStruct, SignatureType, SignedOrder, UnsignedOrder } from './types';
 
 export const orderUtils = {
     createFill: (signedOrder: SignedOrder, takerAssetFillAmount?: BigNumber) => {
@@ -15,7 +15,7 @@ export const orderUtils = {
         };
         return fill;
     },
-    createCancel(signedOrder: SignedOrder, takerAssetCancelAmount?: BigNumber) {
+    createCancel(signedOrder: SignedOrder, takerAssetCancelAmount?: BigNumber): CancelOrder {
         const cancel = {
             order: orderUtils.getOrderStruct(signedOrder),
             takerAssetCancelAmount: takerAssetCancelAmount || signedOrder.takerAssetAmount,
@@ -80,7 +80,7 @@ export const orderUtils = {
         const orderHashHex = `0x${orderHashBuff.toString('hex')}`;
         return orderHashHex;
     },
-    createMatchOrders(signedOrderLeft: SignedOrder, signedOrderRight: SignedOrder) {
+    createMatchOrders(signedOrderLeft: SignedOrder, signedOrderRight: SignedOrder): MatchOrder {
         const fill = {
             left: orderUtils.getOrderStruct(signedOrderLeft),
             right: orderUtils.getOrderStruct(signedOrderRight),
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index 8d81adece4..ef86b4f38a 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -197,3 +197,15 @@ export interface ProxyData {
     tokenAddress?: string;
     data?: any;
 }
+
+export interface CancelOrder {
+    order: OrderStruct;
+    takerAssetCancelAmount: BigNumber;
+}
+
+export interface MatchOrder {
+    left: OrderStruct;
+    right: OrderStruct;
+    leftSignature: string;
+    rightSignature: string;
+}