From 326d8d3976c2695ac574c6889bfed22ebf2b36a4 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Wed, 11 Apr 2018 13:14:12 -0700
Subject: Proxy Metadata -> Data

---
 .../src/contracts/current/protocol/Exchange/Exchange.sol   |  4 ++--
 .../current/protocol/Exchange/MixinSettlementProxy.sol     | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'packages/contracts')

diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
index 9f5573dae..9abc19b86 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
@@ -36,12 +36,12 @@ contract Exchange is
 
     function Exchange(
         IToken _zrxToken,
-        bytes _zrxProxyMetadata,
+        bytes _zrxProxyData,
         IAssetProxy _assetProxyDispatcher)
         public
         MixinExchangeCore()
         MixinSignatureValidator()
-        MixinSettlementProxy(_assetProxyDispatcher, _zrxToken, _zrxProxyMetadata)
+        MixinSettlementProxy(_assetProxyDispatcher, _zrxToken, _zrxProxyData)
         MixinWrapperFunctions()
     {}
 }
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
index 8ffbbf434..e8a7a148f 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
@@ -30,7 +30,7 @@ contract MixinSettlementProxy is
     LibPartialAmount
 {
     IAssetProxy TRANSFER_PROXY;
-    bytes ZRX_PROXY_METADATA;
+    bytes ZRX_PROXY_DATA;
     IToken ZRX_TOKEN;
 
     function transferProxy()
@@ -47,22 +47,22 @@ contract MixinSettlementProxy is
         return ZRX_TOKEN;
     }
 
-    function zrxProxyMetadata()
+    function zrxProxyData()
         external view
         returns (bytes)
     {
-        return ZRX_PROXY_METADATA;
+        return ZRX_PROXY_DATA;
     }
 
     function MixinSettlementProxy(
         IAssetProxy assetProxyDispatcherContract,
         IToken zrxToken,
-        bytes zrxProxyMetadata)
+        bytes zrxProxyData)
         public
     {
         ZRX_TOKEN = zrxToken;
         TRANSFER_PROXY = assetProxyDispatcherContract;
-        ZRX_PROXY_METADATA = zrxProxyMetadata;
+        ZRX_PROXY_DATA = zrxProxyData;
     }
 
     function settleOrder(
@@ -93,7 +93,7 @@ contract MixinSettlementProxy is
             if (order.makerFee > 0) {
                 makerFeePaid = getPartialAmount(takerTokenFilledAmount, order.takerTokenAmount, order.makerFee);
                 TRANSFER_PROXY.transferFrom(
-                    ZRX_PROXY_METADATA,
+                    ZRX_PROXY_DATA,
                     order.makerAddress,
                     order.feeRecipientAddress,
                     makerFeePaid
@@ -102,7 +102,7 @@ contract MixinSettlementProxy is
             if (order.takerFee > 0) {
                 takerFeePaid = getPartialAmount(takerTokenFilledAmount, order.takerTokenAmount, order.takerFee);
                 TRANSFER_PROXY.transferFrom(
-                    ZRX_PROXY_METADATA,
+                    ZRX_PROXY_DATA,
                     takerAddress,
                     order.feeRecipientAddress,
                     takerFeePaid
-- 
cgit v1.2.3