From 342432dc76d1bfc2531fb2edef77afc523eacefe Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Tue, 29 May 2018 22:09:57 -0700
Subject: Update Exchange statuses, revert instead of emmitting event on
 fill/cancel failures, and remove redundant logic in matchOrders

---
 packages/contracts/src/utils/match_order_tester.ts |  1 -
 packages/contracts/src/utils/types.ts              | 22 +++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'packages/contracts/src/utils')

diff --git a/packages/contracts/src/utils/match_order_tester.ts b/packages/contracts/src/utils/match_order_tester.ts
index 09c0d8083..6170188bc 100644
--- a/packages/contracts/src/utils/match_order_tester.ts
+++ b/packages/contracts/src/utils/match_order_tester.ts
@@ -26,7 +26,6 @@ import {
     ContractName,
     ERC20BalancesByOwner,
     ERC721TokenIdsByOwner,
-    ExchangeStatus,
     TransferAmountsByMatchOrders as TransferAmounts,
 } from '../utils/types';
 import { provider, web3Wrapper } from '../utils/web3_wrapper';
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index 6340c4a51..360e1fdbc 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -69,22 +69,14 @@ export interface Token {
     swarmHash: string;
 }
 
-export enum ExchangeStatus {
+export enum OrderStatus {
     INVALID,
-    SUCCESS,
-    ROUNDING_ERROR_TOO_LARGE,
-    INSUFFICIENT_BALANCE_OR_ALLOWANCE,
-    TAKER_ASSET_FILL_AMOUNT_TOO_LOW,
-    INVALID_SIGNATURE,
-    INVALID_SENDER,
-    INVALID_TAKER,
-    INVALID_MAKER,
-    ORDER_INVALID_MAKER_ASSET_AMOUNT,
-    ORDER_INVALID_TAKER_ASSET_AMOUNT,
-    ORDER_FILLABLE,
-    ORDER_EXPIRED,
-    ORDER_FULLY_FILLED,
-    ORDER_CANCELLED,
+    INVALID_MAKER_ASSET_AMOUNT,
+    INVALID_TAKER_ASSET_AMOUNT,
+    FILLABLE,
+    EXPIRED,
+    FULLY_FILLED,
+    CANCELLED,
 }
 
 export enum ContractName {
-- 
cgit v1.2.3