Merge branch 'dev' into messageManagerCleanUp

2 files changed, 4 insertions, 16 deletions

diff --git a/test/unit/idStore-migration-test.js b/test/unit/idStore-migration-test.js
index 3aaf4bb94..81a99ef63 100644
--- a/test/unit/idStore-migration-test.js
+++ b/test/unit/idStore-migration-test.js
@@ -80,18 +80,4 @@ describe('IdentityStore to KeyringController migration', function() {
     })
   })
 
-  describe('entering a password', function() {
-    it('should identify an old wallet as an initialized keyring', function(done) {
-      keyringController.configManager.setWallet('something')
-      keyringController.getState()
-      .then((state) => {
-        assert(state.isInitialized, 'old vault counted as initialized.')
-        assert(!state.lostAccounts, 'no lost accounts')
-        done()
-      })
-      .catch((err) => {
-        done(err)
-      })
-    })
-  })
 })
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index 347aa2bdf..aae4cdfd6 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -104,7 +104,7 @@ describe('KeyringController', function() {
     it('should add the address to the identities hash', function() {
       const fakeAddress = '0x12345678'
       keyringController.createNickname(fakeAddress)
-      const identities = keyringController.identities
+      const identities = keyringController.memStore.getState().identities
       const identity = identities[fakeAddress]
       assert.equal(identity.address, fakeAddress)
     })
@@ -114,7 +114,9 @@ describe('KeyringController', function() {
     it ('sets the nickname', function(done) {
       const account = addresses[0]
       var nick = 'Test nickname'
-      keyringController.identities[ethUtil.addHexPrefix(account)] = {}
+      const identities = keyringController.memStore.getState().identities
+      identities[ethUtil.addHexPrefix(account)] = {}
+      keyringController.memStore.updateState({ identities })
       keyringController.saveAccountLabel(account, nick)
       .then((label) => {
         try {