From 79ed2e902fa3e1d9aadd9e3ecd88f627de5bb100 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 2 Feb 2017 17:07:52 -0800
Subject: [PATCH] keyring - replace getState with memStore

---
 app/scripts/keyring-controller.js  | 30 +-----------------------------
 app/scripts/metamask-controller.js |  2 +-
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 59b8486ff..348f81fc9 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -53,35 +53,7 @@ class KeyringController extends EventEmitter {
   // Not all methods end with this, that might be a nice refactor.
   fullUpdate () {
     this.emit('update')
-    return Promise.resolve(this.getState())
-  }
-
-  // Get State
-  // returns @object state
-  //
-  // This method returns a hash representing the current state
-  // that the keyringController manages.
-  //
-  // It is extended in the MetamaskController along with the EthStore
-  // state, and its own state, to create the metamask state branch
-  // that is passed to the UI.
-  //
-  // This is currently a rare example of a synchronously resolving method
-  // in this class, but will need to be Promisified when we move our
-  // persistence to an async model.
-  getState () {
-
-    // old wallet
-    const memState = this.memStore.getState()
-    const result = {
-      // computed
-      isUnlocked: memState.isUnlocked,
-      // memStore
-      keyringTypes: memState.keyringTypes,
-      identities: memState.identities,
-      keyrings: memState.keyrings,
-    }
-    return result
+    return Promise.resolve(this.memStore.getState())
   }
 
   // Create New Vault And Keychain
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 695491c2a..02dd60528 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -177,7 +177,7 @@ module.exports = class MetamaskController extends EventEmitter {
       this.ethStore.getState(),
       this.txManager.getState(),
       this.messageManager.getState(),
-      this.keyringController.getState(),
+      this.keyringController.memStore.getState(),
       this.preferencesController.store.getState(),
       this.noticeController.getState(),
       // config manager