Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing

* refactor/check-revert-reasons:
  Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed`
  Expect RevertReason be passed in, not string
  Rename RevertReasons to RevertReason since singular enum names are more common

# Conflicts:
#	packages/contracts/test/asset_proxy/proxies.ts
#	packages/contracts/test/exchange/core.ts

1 files changed, 6 insertions, 6 deletions

diff --git a/packages/contracts/test/exchange/match_orders.ts b/packages/contracts/test/exchange/match_orders.ts
index 7c4ad165e..04b566740 100644
--- a/packages/contracts/test/exchange/match_orders.ts
+++ b/packages/contracts/test/exchange/match_orders.ts
@@ -1,6 +1,6 @@
 import { BlockchainLifecycle } from '@0xproject/dev-utils';
 import { assetProxyUtils } from '@0xproject/order-utils';
-import { AssetProxyId, RevertReasons } from '@0xproject/types';
+import { AssetProxyId, RevertReason } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
@@ -603,7 +603,7 @@ describe('matchOrders', () => {
             // Match orders
             return expectRevertReasonOrAlwaysFailingTransactionAsync(
                 exchangeWrapper.matchOrdersAsync(signedOrderLeft, signedOrderRight, takerAddress),
-                RevertReasons.OrderUnfillable,
+                RevertReason.OrderUnfillable,
             );
         });
 
@@ -628,7 +628,7 @@ describe('matchOrders', () => {
             // Match orders
             return expectRevertReasonOrAlwaysFailingTransactionAsync(
                 exchangeWrapper.matchOrdersAsync(signedOrderLeft, signedOrderRight, takerAddress),
-                RevertReasons.OrderUnfillable,
+                RevertReason.OrderUnfillable,
             );
         });
 
@@ -657,7 +657,7 @@ describe('matchOrders', () => {
                     erc20BalancesByOwner,
                     erc721TokenIdsByOwner,
                 ),
-                RevertReasons.NegativeSpreadRequired,
+                RevertReason.NegativeSpreadRequired,
             );
         });
 
@@ -690,7 +690,7 @@ describe('matchOrders', () => {
                 // reverse of the left order, rather than checking equality. This
                 // saves a bunch of gas, but as a result if the assetData fields are
                 // off then the failure ends up happening at signature validation
-                RevertReasons.InvalidOrderSignature,
+                RevertReason.InvalidOrderSignature,
             );
         });
 
@@ -721,7 +721,7 @@ describe('matchOrders', () => {
                     erc20BalancesByOwner,
                     erc721TokenIdsByOwner,
                 ),
-                RevertReasons.InvalidOrderSignature,
+                RevertReason.InvalidOrderSignature,
             );
         });