From 15f68f9b5476993e7bbcdc09f325e4c3834e4b02 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 7 Jul 2017 15:05:04 -0700
Subject: Revert "Rename ZRX to ZRX_TOKEN_CONTRACT"

This reverts commit 6f0b8a185b6fcf58b7427fb907599dbc82c10eaf.
---
 src/artifacts/exchange/Exchange_v1.json   | 26 --------------------------
 src/contract_wrappers/exchange_wrapper.ts |  2 +-
 src/types.ts                              |  2 +-
 3 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/artifacts/exchange/Exchange_v1.json b/src/artifacts/exchange/Exchange_v1.json
index dfebfc338..af36e870d 100644
--- a/src/artifacts/exchange/Exchange_v1.json
+++ b/src/artifacts/exchange/Exchange_v1.json
@@ -115,32 +115,6 @@
       "payable": false,
       "type": "function"
     },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "ZRX_TOKEN_CONTRACT",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "PROXY_CONTRACT",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "type": "function"
-    },
     {
       "constant": false,
       "inputs": [
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 9bedb1b3c..f66e91534 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -800,7 +800,7 @@ export class ExchangeWrapper extends ContractWrapper {
     }
     private async _getZRXTokenAddressAsync(exchangeContractAddress: string): Promise<string> {
         const exchangeInstance = await this._getExchangeContractAsync(exchangeContractAddress);
-        const ZRXtokenAddress = await exchangeInstance.ZRX_TOKEN_CONTRACT.call();
+        const ZRXtokenAddress = await exchangeInstance.ZRX.call();
         return ZRXtokenAddress;
     }
 }
diff --git a/src/types.ts b/src/types.ts
index 2887e83ff..35dfd74d7 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -61,7 +61,7 @@ export interface ExchangeContract extends ContractInstance {
     LogFill: CreateContractEvent;
     LogCancel: CreateContractEvent;
     LogError: CreateContractEvent;
-    ZRX_TOKEN_CONTRACT: {
+    ZRX: {
         call: () => Promise<string>;
     };
     getUnavailableValueT: {
-- 
cgit v1.2.3