From a4666de0ce9eaa99242609fdbf518b6a37650ff2 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 15 Nov 2016 11:07:15 -0800
Subject: Minimize repeated code.

---
 app/scripts/keyring-controller.js    | 13 ++++++-------
 test/unit/keyring-controller-test.js |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index c7e3c32a4..84327b15f 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -153,13 +153,12 @@ module.exports = class KeyringController extends EventEmitter {
   createFirstKeyTree (password, cb) {
     this.clearKeyrings()
     this.addNewKeyring('HD Key Tree', {numberOfAccounts: 1}, (err) => {
-      const firstKeyring = this.keyrings[0]
-      const accounts = firstKeyring.getAccounts()
+      const accounts = this.keyrings[0].getAccounts()
       const firstAccount = accounts[0]
       const hexAccount = normalize(firstAccount)
-      const seedWords = firstKeyring.serialize().mnemonic
       this.configManager.setSelectedAccount(firstAccount)
-      this.configManager.setSeedWords(seedWords)
+
+      this.placeSeedWords()
       autoFaucet(hexAccount)
       this.setupAccounts(accounts)
       this.persistAllKeyrings()
@@ -172,7 +171,7 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  placeSeedWords (cb) {
+  placeSeedWords () {
     const firstKeyring = this.keyrings[0]
     const seedWords = firstKeyring.serialize().mnemonic
     this.configManager.setSeedWords(seedWords)
@@ -237,13 +236,13 @@ module.exports = class KeyringController extends EventEmitter {
   setupAccounts (accounts) {
     var arr = accounts || this.getAccounts()
     arr.forEach((account) => {
-      this.loadBalanceAndNickname(account)
+      this.getBalanceAndNickname(account)
     })
   }
 
   // Takes an account address and an iterator representing
   // the current number of named accounts.
-  loadBalanceAndNickname (account) {
+  getBalanceAndNickname (account) {
     const address = normalize(account)
     this.ethStore.addAccount(address)
     this.createNickname(address)
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index 40e6e0126..2527defe3 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -72,7 +72,7 @@ describe('KeyringController', function() {
       }
       const mock = this.sinon.mock(keyringController)
 
-      mock.expects('loadBalanceAndNickname')
+      mock.expects('getBalanceAndNickname')
       .exactly(1)
 
       var keyring = keyringController.restoreKeyring(mockSerialized)
-- 
cgit v1.2.3