From 9bc481ff62cf9e4a60794000b8cab840405d63fa Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Jun 2018 13:36:57 +0200
Subject: Split balance and allowance amount types in prep of adding the
 "unlimited" allowance enum value

---
 packages/contracts/test/exchange/fill_order.ts | 27 +++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'packages/contracts/test/exchange/fill_order.ts')

diff --git a/packages/contracts/test/exchange/fill_order.ts b/packages/contracts/test/exchange/fill_order.ts
index 5e8dd6ffc..dc1dee91f 100644
--- a/packages/contracts/test/exchange/fill_order.ts
+++ b/packages/contracts/test/exchange/fill_order.ts
@@ -6,14 +6,15 @@ import { CoreCombinatorialUtils, coreCombinatorialUtilsFactoryAsync } from '../.
 import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper';
 
 import {
+    AllowanceAmountScenario,
     AssetDataScenario,
+    BalanceAmountScenario,
     ExpirationTimeSecondsScenario,
     FeeRecipientAddressScenario,
     OrderAssetAmountScenario,
     OrderScenario,
     TakerAssetFillAmountScenario,
     TakerScenario,
-    TokenAmountScenario,
 } from '../../src/utils/types';
 
 chaiSetup.configure();
@@ -33,16 +34,16 @@ const defaultFillScenario = {
     },
     takerAssetFillAmountScenario: TakerAssetFillAmountScenario.LessThanRemainingFillableTakerAssetAmount,
     makerStateScenario: {
-        traderAssetBalance: TokenAmountScenario.Higher,
-        traderAssetAllowance: TokenAmountScenario.Higher,
-        zrxFeeBalance: TokenAmountScenario.Higher,
-        zrxFeeAllowance: TokenAmountScenario.Higher,
+        traderAssetBalance: BalanceAmountScenario.Higher,
+        traderAssetAllowance: AllowanceAmountScenario.Higher,
+        zrxFeeBalance: BalanceAmountScenario.Higher,
+        zrxFeeAllowance: AllowanceAmountScenario.Higher,
     },
     takerStateScenario: {
-        traderAssetBalance: TokenAmountScenario.Higher,
-        traderAssetAllowance: TokenAmountScenario.Higher,
-        zrxFeeBalance: TokenAmountScenario.Higher,
-        zrxFeeAllowance: TokenAmountScenario.Higher,
+        traderAssetBalance: BalanceAmountScenario.Higher,
+        traderAssetAllowance: AllowanceAmountScenario.Higher,
+        zrxFeeBalance: BalanceAmountScenario.Higher,
+        zrxFeeAllowance: AllowanceAmountScenario.Higher,
     },
 };
 
@@ -163,7 +164,7 @@ describe('FillOrder Tests', () => {
                 ...defaultFillScenario,
                 makerStateScenario: {
                     ...defaultFillScenario.makerStateScenario,
-                    traderAssetBalance: TokenAmountScenario.TooLow,
+                    traderAssetBalance: BalanceAmountScenario.TooLow,
                 },
             };
             await coreCombinatorialUtils.testFillOrderScenarioAsync(provider, fillScenario);
@@ -174,7 +175,7 @@ describe('FillOrder Tests', () => {
                 ...defaultFillScenario,
                 takerStateScenario: {
                     ...defaultFillScenario.makerStateScenario,
-                    traderAssetBalance: TokenAmountScenario.TooLow,
+                    traderAssetBalance: BalanceAmountScenario.TooLow,
                 },
             };
             await coreCombinatorialUtils.testFillOrderScenarioAsync(provider, fillScenario);
@@ -185,7 +186,7 @@ describe('FillOrder Tests', () => {
                 ...defaultFillScenario,
                 makerStateScenario: {
                     ...defaultFillScenario.makerStateScenario,
-                    traderAssetAllowance: TokenAmountScenario.TooLow,
+                    traderAssetAllowance: AllowanceAmountScenario.TooLow,
                 },
             };
             await coreCombinatorialUtils.testFillOrderScenarioAsync(provider, fillScenario);
@@ -196,7 +197,7 @@ describe('FillOrder Tests', () => {
                 ...defaultFillScenario,
                 takerStateScenario: {
                     ...defaultFillScenario.makerStateScenario,
-                    traderAssetAllowance: TokenAmountScenario.TooLow,
+                    traderAssetAllowance: AllowanceAmountScenario.TooLow,
                 },
             };
             await coreCombinatorialUtils.testFillOrderScenarioAsync(provider, fillScenario);
-- 
cgit v1.2.3