crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x/contracts-test-utils: Update types for arbitrary fee tokens.

Browse Source
This commit is contained in:
Lawrence Forman
2019-05-14 11:32:57 -04:00
committed by Amir Bandeali
parent 1c1ab3cd87
commit f4bf4ee0f2
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
contracts/test-utils/src/index.ts
View File

@@ -29,30 +29,31 @@ export { bytes32Values, testCombinatoriallyWithReferenceFuncAsync, uint256Values
export { TransactionFactory } from './transaction_factory'; export { TransactionFactory } from './transaction_factory';
export { testWithReferenceFuncAsync } from './test_with_reference'; export { testWithReferenceFuncAsync } from './test_with_reference';
export { export {
MarketBuyOrders,
MarketSellOrders,
ERC721TokenIdsByOwner,
ERC1155FungibleHoldingsByOwner,
ERC1155NonFungibleHoldingsByOwner,
ERC1155HoldingsByOwner,
OrderStatus,
AllowanceAmountScenario, AllowanceAmountScenario,
AssetDataScenario, AssetDataScenario,
BalanceAmountScenario, BalanceAmountScenario,
ContractName, ContractName,
ERC20BalancesByOwner,
ERC1155FungibleHoldingsByOwner,
ERC1155HoldingsByOwner,
ERC1155NonFungibleHoldingsByOwner,
ERC721TokenIdsByOwner,
ExpirationTimeSecondsScenario, ExpirationTimeSecondsScenario,
TransferAmountsLoggedByMatchOrders, FeeAssetDataScenario,
TransferAmountsByMatchOrders,
OrderScenario,
TraderStateScenario,
TransactionDataParams,
Token,
FillScenario,
FeeRecipientAddressScenario, FeeRecipientAddressScenario,
FillResults,
FillScenario,
MarketBuyOrders,
MarketSellOrders,
OrderAssetAmountScenario, OrderAssetAmountScenario,
OrderInfo,
OrderScenario,
OrderStatus,
TakerAssetFillAmountScenario, TakerAssetFillAmountScenario,
TakerScenario, TakerScenario,
OrderInfo, Token,
ERC20BalancesByOwner, TraderStateScenario,
FillResults, TransferAmountsByMatchOrders,
TransferAmountsLoggedByMatchOrders,
TransactionDataParams,
} from './types'; } from './types';

19
contracts/test-utils/src/types.ts
View File

@@ -96,7 +96,6 @@ export enum ContractName {
TokenRegistry = 'TokenRegistry', TokenRegistry = 'TokenRegistry',
MultiSigWalletWithTimeLock = 'MultiSigWalletWithTimeLock', MultiSigWalletWithTimeLock = 'MultiSigWalletWithTimeLock',
Exchange = 'Exchange', Exchange = 'Exchange',
ZRXToken = 'ZRXToken',
DummyERC20Token = 'DummyERC20Token', DummyERC20Token = 'DummyERC20Token',
EtherToken = 'WETH9', EtherToken = 'WETH9',
DutchAuction = 'DutchAuction', DutchAuction = 'DutchAuction',
@@ -188,12 +187,20 @@ export enum ExpirationTimeSecondsScenario {
export enum AssetDataScenario { export enum AssetDataScenario {
ERC20ZeroDecimals = 'ERC20_ZERO_DECIMALS', ERC20ZeroDecimals = 'ERC20_ZERO_DECIMALS',
ZRXFeeToken = 'ZRX_FEE_TOKEN',
ERC20FiveDecimals = 'ERC20_FIVE_DECIMALS', ERC20FiveDecimals = 'ERC20_FIVE_DECIMALS',
ERC20NonZRXEighteenDecimals = 'ERC20_NON_ZRX_EIGHTEEN_DECIMALS', ERC20EighteenDecimals = 'ERC20_EIGHTEEN_DECIMALS',
ERC721 = 'ERC721', ERC721 = 'ERC721',
} }
export enum FeeAssetDataScenario {
ERC20ZeroDecimals = 'ERC20_ZERO_DECIMALS',
ERC20FiveDecimals = 'ERC20_FIVE_DECIMALS',
ERC20EighteenDecimals = 'ERC20_EIGHTEEN_DECIMALS',
ERC721 = 'ERC721',
MakerToken = 'MAKER_TOKEN',
TakerToken = 'TAKER_TOKEN',
}
export enum TakerAssetFillAmountScenario { export enum TakerAssetFillAmountScenario {
Zero = 'ZERO', Zero = 'ZERO',
GreaterThanRemainingFillableTakerAssetAmount = 'GREATER_THAN_REMAINING_FILLABLE_TAKER_ASSET_AMOUNT', GreaterThanRemainingFillableTakerAssetAmount = 'GREATER_THAN_REMAINING_FILLABLE_TAKER_ASSET_AMOUNT',
@@ -211,6 +218,8 @@ export interface OrderScenario {
expirationTimeSecondsScenario: ExpirationTimeSecondsScenario; expirationTimeSecondsScenario: ExpirationTimeSecondsScenario;
makerAssetDataScenario: AssetDataScenario; makerAssetDataScenario: AssetDataScenario;
takerAssetDataScenario: AssetDataScenario; takerAssetDataScenario: AssetDataScenario;
makerFeeAssetDataScenario: FeeAssetDataScenario;
takerFeeAssetDataScenario: FeeAssetDataScenario;
} }
export enum BalanceAmountScenario { export enum BalanceAmountScenario {
@@ -229,8 +238,8 @@ export enum AllowanceAmountScenario {
export interface TraderStateScenario { export interface TraderStateScenario {
traderAssetBalance: BalanceAmountScenario; traderAssetBalance: BalanceAmountScenario;
traderAssetAllowance: AllowanceAmountScenario; traderAssetAllowance: AllowanceAmountScenario;
zrxFeeBalance: BalanceAmountScenario; feeBalance: BalanceAmountScenario;
zrxFeeAllowance: AllowanceAmountScenario; feeAllowance: AllowanceAmountScenario;
} }
export interface FillScenario { export interface FillScenario {