aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-20 19:36:57 +0800
committerFabio Berger <me@fabioberger.com>2018-06-20 19:36:57 +0800
commit9bc481ff62cf9e4a60794000b8cab840405d63fa (patch)
tree0bd205f19277e316ae94e85de4e97ad45223ab23 /packages/contracts/test
parent32dea43d2e207ae235f3c7c869d307906a49660a (diff)
downloaddexon-sol-tools-9bc481ff62cf9e4a60794000b8cab840405d63fa.tar
dexon-sol-tools-9bc481ff62cf9e4a60794000b8cab840405d63fa.tar.gz
dexon-sol-tools-9bc481ff62cf9e4a60794000b8cab840405d63fa.tar.bz2
dexon-sol-tools-9bc481ff62cf9e4a60794000b8cab840405d63fa.tar.lz
dexon-sol-tools-9bc481ff62cf9e4a60794000b8cab840405d63fa.tar.xz
dexon-sol-tools-9bc481ff62cf9e4a60794000b8cab840405d63fa.tar.zst
dexon-sol-tools-9bc481ff62cf9e4a60794000b8cab840405d63fa.zip
Split balance and allowance amount types in prep of adding the "unlimited" allowance enum value
Diffstat (limited to 'packages/contracts/test')
-rw-r--r--packages/contracts/test/exchange/fill_order.ts27
1 files changed, 14 insertions, 13 deletions
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);