From 3126279de715d74a73af270a730cf5b0c069634f Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 7 Jun 2017 16:55:25 +0200
Subject: Use batchCancel for normal cancel

---
 src/contract_wrappers/exchange_wrapper.ts | 33 +++++--------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index f67a125aa..e4d360690 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -175,35 +175,12 @@ export class ExchangeWrapper extends ContractWrapper {
     /**
      * Cancel a given fill amount of an order. Cancellations are cumulative.
      */
-    public async cancelOrderAsync(order: Order|SignedOrder, takerTokenCancelAmount: BigNumber.BigNumber): Promise<void> {
-        assert.doesConformToSchema('order',
-            SchemaValidator.convertToJSONSchemaCompatibleObject(order as object),
-            orderSchema);
-        assert.isBigNumber('takerTokenCancelAmount', takerTokenCancelAmount);
-        await assert.isSenderAddressAvailableAsync(this.web3Wrapper, 'order.maker', order.maker);
-
-        const exchangeInstance = await this.getExchangeContractAsync();
-        await this.validateCancelOrderAndThrowIfInvalidAsync(order, takerTokenCancelAmount);
-
-        const [orderAddresses, orderValues] = ExchangeWrapper.getOrderAddressesAndValues(order);
-        const gas = await exchangeInstance.cancel.estimateGas(
-            orderAddresses,
-            orderValues,
+    public async cancelOrderAsync(
+        order: Order|SignedOrder, takerTokenCancelAmount: BigNumber.BigNumber): Promise<void> {
+        await this.batchCancelOrderAsync([{
+            order,
             takerTokenCancelAmount,
-            {
-                from: order.maker,
-            },
-        );
-        const response: ContractResponse = await exchangeInstance.cancel(
-            orderAddresses,
-            orderValues,
-            takerTokenCancelAmount,
-            {
-                from: order.maker,
-                gas,
-            },
-        );
-        this.throwErrorLogsAsErrors(response.logs);
+        }]);
     }
     /**
      * Batch version of cancelOrderAsync. Atomically cancels multiple orders in a single transaction.
-- 
cgit v1.2.3