From 342a697e42a7209d9454fcd38321e64c7fca3fd0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 9 Mar 2018 15:08:22 +0100
Subject: Remove _exchangeAddress instance var from blockchain class

---
 packages/website/ts/blockchain.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index fca9504d7..db8a56899 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -213,7 +213,6 @@ export class Blockchain {
         const shouldPollUserAddress = false;
         this._web3Wrapper = new Web3Wrapper(this._dispatcher, provider, this.networkId, shouldPollUserAddress);
         this._zeroEx.setProvider(provider, this.networkId);
-        await this._postInstantiationOrUpdatingProviderZeroExAsync();
         this._web3Wrapper.startEmittingNetworkConnectionAndUserBalanceState();
         this._dispatcher.updateProviderType(ProviderType.Ledger);
     }
@@ -235,7 +234,6 @@ export class Blockchain {
         this._userAddress = await this._web3Wrapper.getFirstAccountIfExistsAsync();
 
         this._zeroEx.setProvider(provider, this.networkId);
-        await this._postInstantiationOrUpdatingProviderZeroExAsync();
 
         await this.fetchTokenInformationAsync();
         this._web3Wrapper.startEmittingNetworkConnectionAndUserBalanceState();
@@ -347,7 +345,7 @@ export class Blockchain {
         return unavailableTakerAmount;
     }
     public getExchangeContractAddressIfExists() {
-        return this._exchangeAddress;
+        return this._zeroEx.exchange.getContractAddress();
     }
     public async validateFillOrderThrowIfInvalidAsync(
         signedOrder: SignedOrder,
@@ -740,19 +738,12 @@ export class Blockchain {
         this._updateProviderName(injectedWeb3);
         const shouldPollUserAddress = true;
         this._web3Wrapper = new Web3Wrapper(this._dispatcher, provider, this.networkId, shouldPollUserAddress);
-        await this._postInstantiationOrUpdatingProviderZeroExAsync();
         this._userAddress = await this._web3Wrapper.getFirstAccountIfExistsAsync();
         this._dispatcher.updateUserAddress(this._userAddress);
         await this.fetchTokenInformationAsync();
         this._web3Wrapper.startEmittingNetworkConnectionAndUserBalanceState();
         await this._rehydrateStoreWithContractEvents();
     }
-    // This method should always be run after instantiating or updating the provider
-    // of the ZeroEx instance.
-    private async _postInstantiationOrUpdatingProviderZeroExAsync() {
-        utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');
-        this._exchangeAddress = this._zeroEx.exchange.getContractAddress();
-    }
     private _updateProviderName(injectedWeb3: Web3) {
         const doesInjectedWeb3Exist = !_.isUndefined(injectedWeb3);
         const providerName = doesInjectedWeb3Exist
-- 
cgit