From fc26a0a8991759a54409096d0c7896da86cea4b7 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 4 Nov 2016 12:11:00 -0700
Subject: Fix network checking

---
 app/scripts/keyring-controller.js | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'app')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 1ca34e0f2..fb3091143 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -38,7 +38,7 @@ module.exports = class KeyringController extends EventEmitter {
     this._unconfTxCbs = {}
     this._unconfMsgCbs = {}
 
-    this.network = null
+    this.network = opts.network
 
     // TEMPORARY UNTIL FULL DEPRECATION:
     this.idStoreMigrator = new IdStoreMigrator({
@@ -69,7 +69,6 @@ module.exports = class KeyringController extends EventEmitter {
       conversionDate: this.configManager.getConversionDate(),
       keyringTypes: this.keyringTypes.map((krt) => krt.type()),
       identities: this.identities,
-      network: this.network,
     }
   }
 
@@ -534,25 +533,6 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  getNetwork(err) {
-    if (err) {
-      this.network = 'loading'
-      this.emit('update')
-    }
-
-    this.web3.version.getNetwork((err, network) => {
-      if (err) {
-        this.network = 'loading'
-        return this.emit('update')
-      }
-      if (global.METAMASK_DEBUG) {
-        console.log('web3.getNetwork returned ' + network)
-      }
-      this.network = network
-      this.emit('update')
-    })
-  }
-
   addGasBuffer(gasHex) {
     var gas = new BN(gasHex, 16)
     var buffer = new BN('100000', 10)
-- 
cgit v1.2.3