From 1aaa0020d099f4343bd7ce2f3374b1af9b6cce21 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 7 Jul 2017 15:54:25 -0700
Subject: Migrate batchFillOrKillOrders

---
 src/artifacts/exchange/Exchange_v1.json   |  4 ++--
 src/contract_wrappers/exchange_wrapper.ts | 10 +++++-----
 src/types.ts                              |  7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/artifacts/exchange/Exchange_v1.json b/src/artifacts/exchange/Exchange_v1.json
index 106dc70a1..f705ad688 100644
--- a/src/artifacts/exchange/Exchange_v1.json
+++ b/src/artifacts/exchange/Exchange_v1.json
@@ -313,7 +313,7 @@
           "type": "uint256[6][]"
         },
         {
-          "name": "fillValuesT",
+          "name": "fillTakerTokenAmounts",
           "type": "uint256[]"
         },
         {
@@ -329,7 +329,7 @@
           "type": "bytes32[]"
         }
       ],
-      "name": "batchFillOrKill",
+      "name": "batchFillOrKillOrders",
       "outputs": [
         {
           "name": "success",
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 686208995..e551cd9d8 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -453,13 +453,13 @@ export class ExchangeWrapper extends ContractWrapper {
         });
 
         // We use _.unzip<any> because _.unzip doesn't type check if values have different types :'(
-        const [orderAddresses, orderValues, fillTakerAmounts, vParams, rParams, sParams] =
+        const [orderAddresses, orderValues, fillTakerTokenAmounts, vParams, rParams, sParams] =
               _.unzip<any>(orderAddressesValuesAndTakerTokenFillAmounts);
 
-        const gas = await exchangeInstance.batchFillOrKill.estimateGas(
+        const gas = await exchangeInstance.batchFillOrKillOrders.estimateGas(
             orderAddresses,
             orderValues,
-            fillTakerAmounts,
+            fillTakerTokenAmounts,
             vParams,
             rParams,
             sParams,
@@ -467,10 +467,10 @@ export class ExchangeWrapper extends ContractWrapper {
                 from: takerAddress,
             },
         );
-        const response: ContractResponse = await exchangeInstance.batchFillOrKill(
+        const response: ContractResponse = await exchangeInstance.batchFillOrKillOrders(
             orderAddresses,
             orderValues,
-            fillTakerAmounts,
+            fillTakerTokenAmounts,
             vParams,
             rParams,
             sParams,
diff --git a/src/types.ts b/src/types.ts
index b854aac66..a65772878 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -118,10 +118,11 @@ export interface ExchangeContract extends ContractInstance {
         estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, fillAmount: BigNumber.BigNumber,
                       v: number, r: string, s: string, txOpts?: TxOpts) => number;
     };
-    batchFillOrKill: {
-        (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillValuesT: BigNumber.BigNumber[],
+    batchFillOrKillOrders: {
+        (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillTakerTokenAmounts: BigNumber.BigNumber[],
          v: number[], r: string[], s: string[], txOpts: TxOpts): ContractResponse;
-        estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillValuesT: BigNumber.BigNumber[],
+        estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[],
+                      fillTakerTokenAmounts: BigNumber.BigNumber[],
                       v: number[], r: string[], s: string[], txOpts?: TxOpts) => number;
     };
     filled: {
-- 
cgit v1.2.3