Add marketBuyOrders, rename variables, and fx old tests

1 files changed, 30 insertions, 49 deletions

diff --git a/packages/contracts/src/utils/formatters.ts b/packages/contracts/src/utils/formatters.ts
index 2b261f967..d70c03cb8 100644
--- a/packages/contracts/src/utils/formatters.ts
+++ b/packages/contracts/src/utils/formatters.ts
@@ -1,78 +1,59 @@
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 
-import { BatchCancelOrders, BatchFillOrders, MarketFillOrders, SignedOrder } from './types';
+import { orderUtils } from './order_utils';
+import { BatchCancelOrders, BatchFillOrders, MarketBuyOrders, MarketSellOrders, SignedOrder } from './types';
 
 export const formatters = {
-    createBatchFill(signedOrders: SignedOrder[], takerTokenFillAmounts: BigNumber[] = []) {
+    createBatchFill(signedOrders: SignedOrder[], takerSellAmounts: BigNumber[] = []) {
         const batchFill: BatchFillOrders = {
             orders: [],
             signatures: [],
-            takerTokenFillAmounts,
+            takerSellAmounts,
         };
         _.forEach(signedOrders, signedOrder => {
-            batchFill.orders.push({
-                makerAddress: signedOrder.makerAddress,
-                takerAddress: signedOrder.takerAddress,
-                makerTokenAddress: signedOrder.makerTokenAddress,
-                takerTokenAddress: signedOrder.takerTokenAddress,
-                feeRecipientAddress: signedOrder.feeRecipientAddress,
-                makerTokenAmount: signedOrder.makerTokenAmount,
-                takerTokenAmount: signedOrder.takerTokenAmount,
-                makerFeeAmount: signedOrder.makerFeeAmount,
-                takerFeeAmount: signedOrder.takerFeeAmount,
-                expirationTimeSeconds: signedOrder.expirationTimeSeconds,
-                salt: signedOrder.salt,
-            });
+            const orderStruct = orderUtils.getOrderStruct(signedOrder);
+            batchFill.orders.push(orderStruct);
             batchFill.signatures.push(signedOrder.signature);
-            if (takerTokenFillAmounts.length < signedOrders.length) {
-                batchFill.takerTokenFillAmounts.push(signedOrder.takerTokenAmount);
+            if (takerSellAmounts.length < signedOrders.length) {
+                batchFill.takerSellAmounts.push(signedOrder.makerBuyAmount);
             }
         });
         return batchFill;
     },
-    createMarketFillOrders(signedOrders: SignedOrder[], takerTokenFillAmount: BigNumber) {
-        const marketFillOrders: MarketFillOrders = {
+    createMarketSellOrders(signedOrders: SignedOrder[], takerSellAmount: BigNumber) {
+        const marketSellOrders: MarketSellOrders = {
             orders: [],
             signatures: [],
-            takerTokenFillAmount,
+            takerSellAmount,
         };
         _.forEach(signedOrders, signedOrder => {
-            marketFillOrders.orders.push({
-                makerAddress: signedOrder.makerAddress,
-                takerAddress: signedOrder.takerAddress,
-                makerTokenAddress: signedOrder.makerTokenAddress,
-                takerTokenAddress: signedOrder.takerTokenAddress,
-                feeRecipientAddress: signedOrder.feeRecipientAddress,
-                makerTokenAmount: signedOrder.makerTokenAmount,
-                takerTokenAmount: signedOrder.takerTokenAmount,
-                makerFeeAmount: signedOrder.makerFeeAmount,
-                takerFeeAmount: signedOrder.takerFeeAmount,
-                expirationTimeSeconds: signedOrder.expirationTimeSeconds,
-                salt: signedOrder.salt,
-            });
-            marketFillOrders.signatures.push(signedOrder.signature);
+            const orderStruct = orderUtils.getOrderStruct(signedOrder);
+            marketSellOrders.orders.push(orderStruct);
+            marketSellOrders.signatures.push(signedOrder.signature);
         });
-        return marketFillOrders;
+        return marketSellOrders;
+    },
+    createMarketBuyOrders(signedOrders: SignedOrder[], takerBuyAmount: BigNumber) {
+        const marketBuyOrders: MarketBuyOrders = {
+            orders: [],
+            signatures: [],
+            takerBuyAmount,
+        };
+        _.forEach(signedOrders, signedOrder => {
+            const orderStruct = orderUtils.getOrderStruct(signedOrder);
+            marketBuyOrders.orders.push(orderStruct);
+            marketBuyOrders.signatures.push(signedOrder.signature);
+        });
+        return marketBuyOrders;
     },
     createBatchCancel(signedOrders: SignedOrder[]) {
         const batchCancel: BatchCancelOrders = {
             orders: [],
         };
         _.forEach(signedOrders, signedOrder => {
-            batchCancel.orders.push({
-                makerAddress: signedOrder.makerAddress,
-                takerAddress: signedOrder.takerAddress,
-                makerTokenAddress: signedOrder.makerTokenAddress,
-                takerTokenAddress: signedOrder.takerTokenAddress,
-                feeRecipientAddress: signedOrder.feeRecipientAddress,
-                makerTokenAmount: signedOrder.makerTokenAmount,
-                takerTokenAmount: signedOrder.takerTokenAmount,
-                makerFeeAmount: signedOrder.makerFeeAmount,
-                takerFeeAmount: signedOrder.takerFeeAmount,
-                expirationTimeSeconds: signedOrder.expirationTimeSeconds,
-                salt: signedOrder.salt,
-            });
+            const orderStruct = orderUtils.getOrderStruct(signedOrder);
+            batchCancel.orders.push(orderStruct);
         });
         return batchCancel;
     },