From 4d509331893066de7630e76ac19f3795a1ab637b Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 7 Feb 2018 14:48:59 +0100
Subject: Rename exchangeContract to exchangeContractAddress

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

diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index c0b16f251..88e39b1d3 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -422,7 +422,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
             const parsedTakerFee = new BigNumber(parsedOrder.taker.feeAmount);
 
             const zeroExOrder: ZeroExOrder = {
-                exchangeContractAddress: parsedOrder.exchangeContract,
+                exchangeContractAddress: parsedOrder.exchangeContractAddress,
                 expirationUnixTimestampSec: expiration,
                 feeRecipient: parsedOrder.feeRecipient,
                 maker: parsedOrder.maker.address,
@@ -443,7 +443,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                 orderJSONErrMsg = `This order was made on another Ethereum network
                                    (id: ${parsedOrder.networkId}). Connect to this network to fill.`;
                 parsedOrder = undefined;
-            } else if (exchangeContractAddr !== parsedOrder.exchangeContract) {
+            } else if (exchangeContractAddr !== parsedOrder.exchangeContractAddress) {
                 orderJSONErrMsg = 'This order was made using a deprecated 0x Exchange contract.';
                 parsedOrder = undefined;
             } else if (orderHash !== signature.hash) {
diff --git a/packages/website/ts/schemas/order_schema.ts b/packages/website/ts/schemas/order_schema.ts
index 1d9e96fee..a7fbae411 100644
--- a/packages/website/ts/schemas/order_schema.ts
+++ b/packages/website/ts/schemas/order_schema.ts
@@ -7,7 +7,7 @@ export const orderSchema = {
         signature: { $ref: '/SignatureData' },
         expirationUnixTimestampSec: { type: 'string' },
         feeRecipient: { type: 'string' },
-        exchangeContract: { type: 'string' },
+        exchangeContractAddress: { type: 'string' },
         networkId: { type: 'number' },
     },
     required: [
@@ -17,7 +17,7 @@ export const orderSchema = {
         'signature',
         'expirationUnixTimestampSec',
         'feeRecipient',
-        'exchangeContract',
+        'exchangeContractAddress',
         'networkId',
     ],
     type: 'object',
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 4ac972783..b64d164a1 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -87,7 +87,7 @@ export interface SerializedOrder {
     feeRecipient: string;
     salt: string;
     signature: SignatureData;
-    exchangeContract: string;
+    exchangeContractAddress: string;
     networkId: number;
 }
 
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 794df8dc7..db153d47a 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -60,9 +60,9 @@ export const utils = {
     },
     generateOrder(
         networkId: number,
-        exchangeContract: string,
+        exchangeContractAddress: string,
         sideToAssetToken: SideToAssetToken,
-        orderExpiryTimestamp: BigNumber,
+        expirationUnixTimestampSec: BigNumber,
         orderTakerAddress: string,
         orderMakerAddress: string,
         makerFee: BigNumber,
@@ -97,11 +97,11 @@ export const utils = {
                 amount: sideToAssetToken[Side.Receive].amount.toString(),
                 feeAmount: takerFee.toString(),
             },
-            expirationUnixTimestampSec: orderExpiryTimestamp.toString(),
+            expirationUnixTimestampSec: expirationUnixTimestampSec.toString(),
             feeRecipient,
             salt: orderSalt.toString(),
             signature: signatureData,
-            exchangeContract,
+            exchangeContractAddress,
             networkId,
         };
         return order;
-- 
cgit