From 18dc5d17b552f03294c6ea13ae0d2cdcc72ac0fd Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 7 Feb 2018 14:54:37 +0100
Subject: Rename signature to ecSignature

---
 packages/website/ts/components/fill_order.tsx | 10 +++++-----
 packages/website/ts/schemas/order_schema.ts   |  4 ++--
 packages/website/ts/types.ts                  |  2 +-
 packages/website/ts/utils/utils.ts            |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index 88e39b1d3..33c88f61e 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -437,7 +437,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
             };
             const orderHash = ZeroEx.getOrderHashHex(zeroExOrder);
 
-            const signature = parsedOrder.signature;
+            const signature = parsedOrder.ecSignature;
             const isValidSignature = ZeroEx.isValidSignature(signature.hash, signature, parsedOrder.maker.address);
             if (this.props.networkId !== parsedOrder.networkId) {
                 orderJSONErrMsg = `This order was made on another Ethereum network
@@ -478,7 +478,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
             // Clear cache entry if user updates orderJSON to invalid entry
             this.props.dispatcher.updateUserSuppliedOrderCache(undefined);
         } else {
-            const orderHash = parsedOrder.signature.hash;
+            const orderHash = parsedOrder.ecSignature.hash;
             unavailableTakerAmount = await this.props.blockchain.getUnavailableTakerAmountAsync(orderHash);
             const isMakerTokenAddressInRegistry = await this.props.blockchain.isAddressInTokenRegistryAsync(
                 parsedOrder.maker.token.address,
@@ -540,7 +540,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
             new BigNumber(parsedOrder.taker.feeAmount),
             new BigNumber(this.state.parsedOrder.expirationUnixTimestampSec),
             parsedOrder.feeRecipient,
-            parsedOrder.signature,
+            parsedOrder.ecSignature,
             new BigNumber(parsedOrder.salt),
         );
         if (_.isEmpty(globalErrMsg)) {
@@ -618,7 +618,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
         });
 
         const parsedOrder = this.state.parsedOrder;
-        const orderHash = parsedOrder.signature.hash;
+        const orderHash = parsedOrder.ecSignature.hash;
         const takerAddress = this.props.userAddress;
 
         if (_.isUndefined(takerAddress)) {
@@ -643,7 +643,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
             new BigNumber(parsedOrder.taker.feeAmount),
             new BigNumber(this.state.parsedOrder.expirationUnixTimestampSec),
             parsedOrder.feeRecipient,
-            parsedOrder.signature,
+            parsedOrder.ecSignature,
             new BigNumber(parsedOrder.salt),
         );
         const unavailableTakerAmount = await this.props.blockchain.getUnavailableTakerAmountAsync(orderHash);
diff --git a/packages/website/ts/schemas/order_schema.ts b/packages/website/ts/schemas/order_schema.ts
index a7fbae411..430f707da 100644
--- a/packages/website/ts/schemas/order_schema.ts
+++ b/packages/website/ts/schemas/order_schema.ts
@@ -4,7 +4,7 @@ export const orderSchema = {
         maker: { $ref: '/OrderTaker' },
         taker: { $ref: '/OrderTaker' },
         salt: { type: 'string' },
-        signature: { $ref: '/SignatureData' },
+        ecSignature: { $ref: '/SignatureData' },
         expirationUnixTimestampSec: { type: 'string' },
         feeRecipient: { type: 'string' },
         exchangeContractAddress: { type: 'string' },
@@ -14,7 +14,7 @@ export const orderSchema = {
         'maker',
         'taker',
         'salt',
-        'signature',
+        'ecSignature',
         'expirationUnixTimestampSec',
         'feeRecipient',
         'exchangeContractAddress',
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index b64d164a1..dad2e734f 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -86,7 +86,7 @@ export interface SerializedOrder {
     expirationUnixTimestampSec: string;
     feeRecipient: string;
     salt: string;
-    signature: SignatureData;
+    ecSignature: SignatureData;
     exchangeContractAddress: string;
     networkId: number;
 }
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index db153d47a..7204586c6 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -68,7 +68,7 @@ export const utils = {
         makerFee: BigNumber,
         takerFee: BigNumber,
         feeRecipient: string,
-        signatureData: SignatureData,
+        ecSignature: SignatureData,
         tokenByAddress: TokenByAddress,
         orderSalt: BigNumber,
     ): SerializedOrder {
@@ -100,7 +100,7 @@ export const utils = {
             expirationUnixTimestampSec: expirationUnixTimestampSec.toString(),
             feeRecipient,
             salt: orderSalt.toString(),
-            signature: signatureData,
+            ecSignature,
             exchangeContractAddress,
             networkId,
         };
-- 
cgit v1.2.3