From 9e2f8bead9a51a4c30b77781ae3b39bed31c36ee Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Thu, 8 Feb 2018 17:48:06 -0800
Subject: Merge development

---
 packages/contracts/util/formatters.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/contracts/util/formatters.ts')

diff --git a/packages/contracts/util/formatters.ts b/packages/contracts/util/formatters.ts
index e3080af15..88e12a6b4 100644
--- a/packages/contracts/util/formatters.ts
+++ b/packages/contracts/util/formatters.ts
@@ -76,11 +76,11 @@ export const formatters = {
         });
         return marketFillOrders;
     },
-    createBatchCancel(signedOrders: SignedOrder[], cancelTakerTokenAmounts: BigNumber[] = []) {
+    createBatchCancel(signedOrders: SignedOrder[], takerTokenCancelAmounts: BigNumber[] = []) {
         const batchCancel: BatchCancelOrders = {
             orderAddresses: [],
             orderValues: [],
-            cancelTakerTokenAmounts,
+            takerTokenCancelAmounts,
         };
         signedOrders.forEach(signedOrder => {
             batchCancel.orderAddresses.push([
@@ -98,8 +98,8 @@ export const formatters = {
                 signedOrder.expirationUnixTimestampSec,
                 signedOrder.salt,
             ]);
-            if (cancelTakerTokenAmounts.length < signedOrders.length) {
-                batchCancel.cancelTakerTokenAmounts.push(signedOrder.takerTokenAmount);
+            if (takerTokenCancelAmounts.length < signedOrders.length) {
+                batchCancel.takerTokenCancelAmounts.push(signedOrder.takerTokenAmount);
             }
         });
         return batchCancel;
-- 
cgit v1.2.3