Merge pull request #1057 from MetaMask/kumavis-refactor1

background - various refactor, cleanups, and fixes

1 files changed, 1 insertions, 12 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 741757c5a..0a1965782 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -41,17 +41,6 @@ module.exports = class KeyringController extends EventEmitter {
     this.getNetwork = opts.getNetwork
   }
 
-  // Set Store
-  //
-  // Allows setting the ethStore after the constructor.
-  // This is currently required because of the initialization order
-  // of the ethStore and this class.
-  //
-  // Eventually would be nice to be able to add this in the constructor.
-  setStore (ethStore) {
-    this.ethStore = ethStore
-  }
-
   // Full Update
   // returns Promise( @object state )
   //
@@ -651,7 +640,7 @@ module.exports = class KeyringController extends EventEmitter {
   clearKeyrings () {
     let accounts
     try {
-      accounts = Object.keys(this.ethStore._currentState.accounts)
+      accounts = Object.keys(this.ethStore.getState())
     } catch (e) {
       accounts = []
     }