From 73a48ddb0d36064a1c5f50c3b917992fe5de89b4 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 7 Jul 2017 14:20:39 -0700
Subject: Refactor net_version caching logic

---
 src/web3_wrapper.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index 8c410eef7..61bac45c9 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -11,7 +11,7 @@ export class Web3Wrapper {
         this.web3.setProvider(provider);
     }
     public setProvider(provider: Web3.Provider) {
-        this.networkIdIfExists = undefined;
+        delete this.networkIdIfExists;
         this.web3.setProvider(provider);
     }
     public isAddress(address: string): boolean {
@@ -29,16 +29,16 @@ export class Web3Wrapper {
         return this.web3.currentProvider;
     }
     public async getNetworkIdIfExistsAsync(): Promise<number|undefined> {
-        if (_.isUndefined(this.networkIdIfExists)) {
-            try {
-                const networkId = await this.getNetworkAsync();
-                this.networkIdIfExists = Number(networkId);
-                return this.networkIdIfExists;
-            } catch (err) {
-                return undefined;
-            }
-        } else {
+        if (!_.isUndefined(this.networkIdIfExists)) {
+          return this.networkIdIfExists;
+        }
+
+        try {
+            const networkId = await this.getNetworkAsync();
+            this.networkIdIfExists = Number(networkId);
             return this.networkIdIfExists;
+        } catch (err) {
+            return undefined;
         }
     }
     public toWei(ethAmount: BigNumber.BigNumber): BigNumber.BigNumber {
-- 
cgit v1.2.3