From 79b8f85cdf53c7de00c4d3ddfe34767e627c4774 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Thu, 16 May 2019 02:16:22 -0400 Subject: [PATCH] `@0x/contracts-test-utils`: Remove `TransferAmountsByMatchOrders` and `TransferAmountsLoggedByMatchOrders`. `@0x/contracts-test-utils`: Add `TokenBalancesByOwner` type. --- contracts/test-utils/src/index.ts | 3 +-- contracts/test-utils/src/types.ts | 29 +++++------------------------ 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/contracts/test-utils/src/index.ts b/contracts/test-utils/src/index.ts index b798999735..ae1a9f373f 100644 --- a/contracts/test-utils/src/index.ts +++ b/contracts/test-utils/src/index.ts @@ -52,8 +52,7 @@ export { TakerAssetFillAmountScenario, TakerScenario, Token, + TokenBalancesByOwner, TraderStateScenario, - TransferAmountsByMatchOrders, - TransferAmountsLoggedByMatchOrders, TransactionDataParams, } from './types'; diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts index 44d12a22ca..ea0bdb6f24 100644 --- a/contracts/test-utils/src/types.ts +++ b/contracts/test-utils/src/types.ts @@ -37,6 +37,11 @@ export interface ERC1155HoldingsByOwner { nonFungible: ERC1155NonFungibleHoldingsByOwner; } +export interface TokenBalancesByOwner { + erc20: ERC20BalancesByOwner; + erc721: ERC721TokenIdsByOwner; +} + export interface SubmissionContractEventArgs { transactionId: BigNumber; } @@ -119,30 +124,6 @@ export enum ContractName { BalanceThresholdFilter = 'BalanceThresholdFilter', } -export interface TransferAmountsByMatchOrders { - // Left Maker - amountBoughtByLeftMaker: BigNumber; - amountSoldByLeftMaker: BigNumber; - feePaidByLeftMaker: BigNumber; - // Right Maker - amountBoughtByRightMaker: BigNumber; - amountSoldByRightMaker: BigNumber; - feePaidByRightMaker: BigNumber; - // Taker - amountReceivedByTaker: BigNumber; - feePaidByTakerLeft: BigNumber; - feePaidByTakerRight: BigNumber; -} - -export interface TransferAmountsLoggedByMatchOrders { - makerAddress: string; - takerAddress: string; - makerAssetFilledAmount: string; - takerAssetFilledAmount: string; - makerFeePaid: string; - takerFeePaid: string; -} - export interface OrderInfo { orderStatus: number; orderHash: string;