From 11c8c07bfc6677e347873f02ae8c401f8d6c4dcf Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 22 Sep 2017 13:59:25 -0700
Subject: Refactor eth-store into account-tracker

EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it.
---
 app/scripts/controllers/balances.js          | 64 ----------------------------
 app/scripts/controllers/computed-balances.js | 64 ++++++++++++++++++++++++++++
 app/scripts/controllers/transactions.js      |  6 +--
 3 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 app/scripts/controllers/balances.js
 create mode 100644 app/scripts/controllers/computed-balances.js

(limited to 'app/scripts/controllers')

diff --git a/app/scripts/controllers/balances.js b/app/scripts/controllers/balances.js
deleted file mode 100644
index 89c2ca95d..000000000
--- a/app/scripts/controllers/balances.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const ObservableStore = require('obs-store')
-const extend = require('xtend')
-const BalanceController = require('./balance')
-
-class BalancesController {
-
-  constructor (opts = {}) {
-    const { ethStore, txController } = opts
-    this.ethStore = ethStore
-    this.txController = txController
-
-    const initState = extend({
-      computedBalances: {},
-    }, opts.initState)
-    this.store = new ObservableStore(initState)
-    this.balances = {}
-
-    this._initBalanceUpdating()
-  }
-
-  updateAllBalances () {
-    for (let address in this.balances) {
-      this.balances[address].updateBalance()
-    }
-  }
-
-  _initBalanceUpdating () {
-    const store = this.ethStore.getState()
-    this.addAnyAccountsFromStore(store)
-    this.ethStore.subscribe(this.addAnyAccountsFromStore.bind(this))
-  }
-
-  addAnyAccountsFromStore(store) {
-    const balances = store.accounts
-
-    for (let address in balances) {
-      this.trackAddressIfNotAlready(address)
-    }
-  }
-
-  trackAddressIfNotAlready (address) {
-    const state = this.store.getState()
-    if (!(address in state.computedBalances)) {
-      this.trackAddress(address)
-    }
-  }
-
-  trackAddress (address) {
-    let updater = new BalanceController({
-      address,
-      ethStore: this.ethStore,
-      txController: this.txController,
-    })
-    updater.store.subscribe((accountBalance) => {
-      let newState = this.store.getState()
-      newState.computedBalances[address] = accountBalance
-      this.store.updateState(newState)
-    })
-    this.balances[address] = updater
-    updater.updateBalance()
-  }
-}
-
-module.exports = BalancesController
diff --git a/app/scripts/controllers/computed-balances.js b/app/scripts/controllers/computed-balances.js
new file mode 100644
index 000000000..a85eb5590
--- /dev/null
+++ b/app/scripts/controllers/computed-balances.js
@@ -0,0 +1,64 @@
+const ObservableStore = require('obs-store')
+const extend = require('xtend')
+const BalanceController = require('./balance')
+
+class ComputedbalancesController {
+
+  constructor (opts = {}) {
+    const { ethStore, txController } = opts
+    this.ethStore = ethStore
+    this.txController = txController
+
+    const initState = extend({
+      computedBalances: {},
+    }, opts.initState)
+    this.store = new ObservableStore(initState)
+    this.balances = {}
+
+    this._initBalanceUpdating()
+  }
+
+  updateAllBalances () {
+    for (let address in this.balances) {
+      this.balances[address].updateBalance()
+    }
+  }
+
+  _initBalanceUpdating () {
+    const store = this.ethStore.getState()
+    this.addAnyAccountsFromStore(store)
+    this.ethStore.subscribe(this.addAnyAccountsFromStore.bind(this))
+  }
+
+  addAnyAccountsFromStore(store) {
+    const balances = store.accounts
+
+    for (let address in balances) {
+      this.trackAddressIfNotAlready(address)
+    }
+  }
+
+  trackAddressIfNotAlready (address) {
+    const state = this.store.getState()
+    if (!(address in state.computedBalances)) {
+      this.trackAddress(address)
+    }
+  }
+
+  trackAddress (address) {
+    let updater = new BalanceController({
+      address,
+      ethStore: this.ethStore,
+      txController: this.txController,
+    })
+    updater.store.subscribe((accountBalance) => {
+      let newState = this.store.getState()
+      newState.computedBalances[address] = accountBalance
+      this.store.updateState(newState)
+    })
+    this.balances[address] = updater
+    updater.updateBalance()
+  }
+}
+
+module.exports = ComputedbalancesController
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 59a3f5329..2aff4e5ff 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -22,7 +22,7 @@ module.exports = class TransactionController extends EventEmitter {
     this.provider = opts.provider
     this.blockTracker = opts.blockTracker
     this.signEthTx = opts.signTransaction
-    this.ethStore = opts.ethStore
+    this.accountTracker = opts.accountTracker
 
     this.nonceTracker = new NonceTracker({
       provider: this.provider,
@@ -52,7 +52,7 @@ module.exports = class TransactionController extends EventEmitter {
       provider: this.provider,
       nonceTracker: this.nonceTracker,
       getBalance: (address) => {
-        const account = this.ethStore.getState().accounts[address]
+        const account = this.accountTracker.getState().accounts[address]
         if (!account) return
         return account.balance
       },
@@ -73,7 +73,7 @@ module.exports = class TransactionController extends EventEmitter {
     this.blockTracker.on('rawBlock', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
     // this is a little messy but until ethstore has been either
     // removed or redone this is to guard against the race condition
-    // where ethStore hasent been populated by the results yet
+    // where accountTracker hasent been populated by the results yet
     this.blockTracker.once('latest', () => {
       this.blockTracker.on('latest', this.pendingTxTracker.resubmitPendingTxs.bind(this.pendingTxTracker))
     })
-- 
cgit