From e9712a13ecd96db0bcc9d22998fc4df2ecdeeebc Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Fri, 11 Aug 2017 14:19:35 -0700
Subject: Create tests for TxStateManager

---
 test/unit/tx-controller-test.js    | 222 +++++-------------------------------
 test/unit/tx-state-manager-test.js | 227 +++++++++++++++++++++++++++++++++++++
 2 files changed, 253 insertions(+), 196 deletions(-)
 create mode 100644 test/unit/tx-state-manager-test.js

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 57d7deccd..40be490c0 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -47,11 +47,12 @@ describe('Transaction Controller', function () {
         metamaskNetworkId: currentNetworkId,
         txParams,
       }
-      txController._saveTxList([txMeta])
+      txController.txStateManager._saveTxList([txMeta])
       stub = sinon.stub(txController, 'addUnapprovedTransaction').returns(Promise.resolve(txMeta))
     })
 
     afterEach(function () {
+      txController.txStateManager._saveTxList([])
       stub.restore()
     })
 
@@ -69,7 +70,7 @@ describe('Transaction Controller', function () {
       txController.once('newUnaprovedTx', (txMetaFromEmit) => {
         setTimeout(() => {
           txController.setTxHash(txMetaFromEmit.id, '0x0')
-          txController.setTxStatusSubmitted(txMetaFromEmit.id)
+          txController.txStateManager.setTxStatusSubmitted(txMetaFromEmit.id)
         }, 10)
       })
 
@@ -84,7 +85,7 @@ describe('Transaction Controller', function () {
     it('should reject when finished and status is rejected', function (done) {
       txController.once('newUnaprovedTx', (txMetaFromEmit) => {
         setTimeout(() => {
-          txController.setTxStatusRejected(txMetaFromEmit.id)
+          txController.txStateManager.setTxStatusRejected(txMetaFromEmit.id)
         }, 10)
       })
 
@@ -107,7 +108,7 @@ describe('Transaction Controller', function () {
         assert(('txParams' in txMeta), 'should have a txParams')
         assert(('history' in txMeta), 'should have a history')
 
-        const memTxMeta = txController.getTx(txMeta.id)
+        const memTxMeta = txController.txStateManager.getTx(txMeta.id)
         assert.deepEqual(txMeta, memTxMeta, `txMeta should be stored in txController after adding it\n  expected: ${txMeta} \n  got: ${memTxMeta}`)
         addTxDefaultsStub.restore()
         done()
@@ -160,202 +161,31 @@ describe('Transaction Controller', function () {
     })
   })
 
-  describe('#getTxList', function () {
-    it('when new should return empty array', function () {
-      var result = txController.getTxList()
-      assert.ok(Array.isArray(result))
-      assert.equal(result.length, 0)
-    })
-  })
-
   describe('#addTx', function () {
-    it('adds a tx returned in getTxList', function () {
-      var tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txController.addTx(tx, noop)
-      var result = txController.getTxList()
-      assert.ok(Array.isArray(result))
-      assert.equal(result.length, 1)
-      assert.equal(result[0].id, 1)
-    })
-
-    it('does not override txs from other networks', function () {
-      var tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-      var tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
-      txController.addTx(tx, noop)
-      txController.addTx(tx2, noop)
-      var result = txController.getFullTxList()
-      var result2 = txController.getTxList()
-      assert.equal(result.length, 2, 'txs were deleted')
-      assert.equal(result2.length, 1, 'incorrect number of txs on network.')
-    })
-
-    it('cuts off early txs beyond a limit', function () {
-      const limit = txController.txHistoryLimit
-      for (let i = 0; i < limit + 1; i++) {
-        const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-        txController.addTx(tx, noop)
-      }
-      var result = txController.getTxList()
-      assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
-      assert.equal(result[0].id, 1, 'early txs truncted')
-    })
-
-    it('cuts off early txs beyond a limit whether or not it is confirmed or rejected', function () {
-      const limit = txController.txHistoryLimit
-      for (let i = 0; i < limit + 1; i++) {
-        const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} }
-        txController.addTx(tx, noop)
-      }
-      var result = txController.getTxList()
-      assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
-      assert.equal(result[0].id, 1, 'early txs truncted')
-    })
-
-    it('cuts off early txs beyond a limit but does not cut unapproved txs', function () {
-      var unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txController.addTx(unconfirmedTx, noop)
-      const limit = txController.txHistoryLimit
-      for (let i = 1; i < limit + 1; i++) {
-        const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-        txController.addTx(tx, noop)
-      }
-      var result = txController.getTxList()
-      assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
-      assert.equal(result[0].id, 0, 'first tx should still be there')
-      assert.equal(result[0].status, 'unapproved', 'first tx should be unapproved')
-      assert.equal(result[1].id, 2, 'early txs truncted')
-    })
-  })
-
-  describe('#setTxStatusSigned', function () {
-    it('sets the tx status to signed', function () {
-      var tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txController.addTx(tx, noop)
-      txController.setTxStatusSigned(1)
-      var result = txController.getTxList()
-      assert.ok(Array.isArray(result))
-      assert.equal(result.length, 1)
-      assert.equal(result[0].status, 'signed')
-    })
-
-    it('should emit a signed event to signal the exciton of callback', (done) => {
-      this.timeout(10000)
-      var tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      const noop = function () {
-        assert(true, 'event listener has been triggered and noop executed')
-        done()
-      }
-      txController.addTx(tx)
-      txController.on('1:signed', noop)
-      txController.setTxStatusSigned(1)
-    })
-  })
-
-  describe('#setTxStatusRejected', function () {
-    it('sets the tx status to rejected', function () {
-      var tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txController.addTx(tx)
-      txController.setTxStatusRejected(1)
-      var result = txController.getTxList()
-      assert.ok(Array.isArray(result))
-      assert.equal(result.length, 1)
-      assert.equal(result[0].status, 'rejected')
-    })
-
-    it('should emit a rejected event to signal the exciton of callback', (done) => {
-      this.timeout(10000)
-      var tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txController.addTx(tx)
-      const noop = function (err, txId) {
-        assert(true, 'event listener has been triggered and noop executed')
-        done()
-      }
-      txController.on('1:rejected', noop)
-      txController.setTxStatusRejected(1)
-    })
-  })
-
-  describe('#updateTx', function () {
-    it('replaces the tx with the same id', function () {
-      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txController.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txController.updateTx({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: currentNetworkId, txParams: {} })
-      var result = txController.getTx('1')
-      assert.equal(result.hash, 'foo')
-    })
-
-    it('updates gas price', function () {
-      const originalGasPrice = '0x01'
-      const desiredGasPrice = '0x02'
-
-      const txMeta = {
-        id: '1',
+    it('should emit updates', function (done) {
+      txMeta = {
         status: 'unapproved',
+        id: 1,
         metamaskNetworkId: currentNetworkId,
-        txParams: {
-          gasPrice: originalGasPrice,
-        },
+        txParams: {}
       }
 
-      const updatedMeta = clone(txMeta)
-
+      const eventNames = ['update', 'updateBadge', '1:unapproved']
+      const listeners = []
+      eventNames.forEach((eventName) => {
+        listeners.push(new Promise((resolve) => {
+          txController.once(eventName, (arg) => {
+            resolve(arg)
+          })
+        }))
+      })
+      Promise.all(listeners)
+      .then((returnValues) => {
+        assert.deepEqual(returnValues.pop(), txMeta, 'last event 1:unapproved should return txMeta')
+        done()
+      })
+      .catch(done)
       txController.addTx(txMeta)
-      updatedMeta.txParams.gasPrice = desiredGasPrice
-      txController.updateTx(updatedMeta)
-      var result = txController.getTx('1')
-      assert.equal(result.txParams.gasPrice, desiredGasPrice, 'gas price updated')
-    })
-  })
-
-  describe('#getUnapprovedTxList', function () {
-    it('returns unapproved txs in a hash', function () {
-      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txController.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      const result = txController.getUnapprovedTxList()
-      assert.equal(typeof result, 'object')
-      assert.equal(result['1'].status, 'unapproved')
-      assert.equal(result['2'], undefined)
-    })
-  })
-
-  describe('#getTx', function () {
-    it('returns a tx with the requested id', function () {
-      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txController.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      assert.equal(txController.getTx('1').status, 'unapproved')
-      assert.equal(txController.getTx('2').status, 'confirmed')
-    })
-  })
-
-  describe('#getFilteredTxList', function () {
-    it('returns a tx with the requested data', function () {
-      const txMetas = [
-        { id: 0, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 1, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 2, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 3, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 4, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 5, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 6, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 7, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 8, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 9, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-      ]
-      txMetas.forEach((txMeta) => txController.addTx(txMeta, noop))
-      let filterParams
-
-      filterParams = { status: 'unapproved', from: '0xaa' }
-      assert.equal(txController.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
-      filterParams = { status: 'unapproved', to: '0xaa' }
-      assert.equal(txController.getFilteredTxList(filterParams).length, 2, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
-      filterParams = { status: 'confirmed', from: '0xbb' }
-      assert.equal(txController.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
-      filterParams = { status: 'confirmed' }
-      assert.equal(txController.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
-      filterParams = { from: '0xaa' }
-      assert.equal(txController.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
-      filterParams = { to: '0xaa' }
-      assert.equal(txController.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
     })
   })
 
@@ -389,11 +219,11 @@ describe('Transaction Controller', function () {
 
       const pubStub = sinon.stub(txController, 'publishTransaction').callsFake(() => {
         txController.setTxHash('1', originalValue)
-        txController.setTxStatusSubmitted('1')
+        txController.txStateManager.setTxStatusSubmitted('1')
       })
 
       txController.approveTransaction(txMeta.id).then(() => {
-        const result = txController.getTx(txMeta.id)
+        const result = txController.txStateManager.getTx(txMeta.id)
         const params = result.txParams
 
         assert.equal(params.gas, originalValue, 'gas unmodified')
diff --git a/test/unit/tx-state-manager-test.js b/test/unit/tx-state-manager-test.js
new file mode 100644
index 000000000..0b35465d6
--- /dev/null
+++ b/test/unit/tx-state-manager-test.js
@@ -0,0 +1,227 @@
+const assert = require('assert')
+const clone = require('clone')
+const ObservableStore = require('obs-store')
+const TxStateManager = require('../../app/scripts/lib/tx-state-manager')
+const noop = () => true
+
+describe('TransactionStateManger', function () {
+  let txStateManager
+  const currentNetworkId = 42
+  const otherNetworkId = 2
+
+  beforeEach(function () {
+    txStateManager = new TxStateManager({
+      initState: {
+        transactions: [],
+      },
+      txHistoryLimit: 10,
+      getNetwork: () => currentNetworkId
+    })
+  })
+
+  describe('#setTxStatusSigned', function () {
+    it('sets the tx status to signed', function () {
+      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      txStateManager.addTx(tx, noop)
+      txStateManager.setTxStatusSigned(1)
+      let result = txStateManager.getTxList()
+      assert.ok(Array.isArray(result))
+      assert.equal(result.length, 1)
+      assert.equal(result[0].status, 'signed')
+    })
+
+    it('should emit a signed event to signal the exciton of callback', (done) => {
+      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const noop = function () {
+        assert(true, 'event listener has been triggered and noop executed')
+        done()
+      }
+      txStateManager.addTx(tx)
+      txStateManager.on('1:signed', noop)
+      txStateManager.setTxStatusSigned(1)
+
+    })
+  })
+
+  describe('#setTxStatusRejected', function () {
+    it('sets the tx status to rejected', function () {
+      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      txStateManager.addTx(tx)
+      txStateManager.setTxStatusRejected(1)
+      let result = txStateManager.getTxList()
+      assert.ok(Array.isArray(result))
+      assert.equal(result.length, 1)
+      assert.equal(result[0].status, 'rejected')
+    })
+
+    it('should emit a rejected event to signal the exciton of callback', (done) => {
+      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      txStateManager.addTx(tx)
+      const noop = function (err, txId) {
+        assert(true, 'event listener has been triggered and noop executed')
+        done()
+      }
+      txStateManager.on('1:rejected', noop)
+      txStateManager.setTxStatusRejected(1)
+    })
+  })
+
+  describe('#getFullTxList', function () {
+    it('when new should return empty array', function () {
+      let result = txStateManager.getTxList()
+      assert.ok(Array.isArray(result))
+      assert.equal(result.length, 0)
+    })
+  })
+
+  describe('#getTxList', function () {
+    it('when new should return empty array', function () {
+      let result = txStateManager.getTxList()
+      assert.ok(Array.isArray(result))
+      assert.equal(result.length, 0)
+    })
+  })
+
+  describe('#addTx', function () {
+    it('adds a tx returned in getTxList', function () {
+      let tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+      txStateManager.addTx(tx, noop)
+      let result = txStateManager.getTxList()
+      assert.ok(Array.isArray(result))
+      assert.equal(result.length, 1)
+      assert.equal(result[0].id, 1)
+    })
+
+    it('does not override txs from other networks', function () {
+      let tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+      let tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
+      txStateManager.addTx(tx, noop)
+      txStateManager.addTx(tx2, noop)
+      let result = txStateManager.getFullTxList()
+      let result2 = txStateManager.getTxList()
+      assert.equal(result.length, 2, 'txs were deleted')
+      assert.equal(result2.length, 1, 'incorrect number of txs on network.')
+    })
+
+    it('cuts off early txs beyond a limit', function () {
+      const limit = txStateManager.txHistoryLimit
+      for (let i = 0; i < limit + 1; i++) {
+        const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+        txStateManager.addTx(tx, noop)
+      }
+      let result = txStateManager.getTxList()
+      assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
+      assert.equal(result[0].id, 1, 'early txs truncted')
+    })
+
+    it('cuts off early txs beyond a limit whether or not it is confirmed or rejected', function () {
+      const limit = txStateManager.txHistoryLimit
+      for (let i = 0; i < limit + 1; i++) {
+        const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} }
+        txStateManager.addTx(tx, noop)
+      }
+      let result = txStateManager.getTxList()
+      assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
+      assert.equal(result[0].id, 1, 'early txs truncted')
+    })
+
+    it('cuts off early txs beyond a limit but does not cut unapproved txs', function () {
+      let unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      txStateManager.addTx(unconfirmedTx, noop)
+      const limit = txStateManager.txHistoryLimit
+      for (let i = 1; i < limit + 1; i++) {
+        const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+        txStateManager.addTx(tx, noop)
+      }
+      let result = txStateManager.getTxList()
+      assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
+      assert.equal(result[0].id, 0, 'first tx should still be there')
+      assert.equal(result[0].status, 'unapproved', 'first tx should be unapproved')
+      assert.equal(result[1].id, 2, 'early txs truncted')
+    })
+  })
+
+  describe('#updateTx', function () {
+    it('replaces the tx with the same id', function () {
+      txStateManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.updateTx({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: currentNetworkId, txParams: {} })
+      let result = txStateManager.getTx('1')
+      assert.equal(result.hash, 'foo')
+    })
+
+    it('updates gas price', function () {
+      const originalGasPrice = '0x01'
+      const desiredGasPrice = '0x02'
+
+      const txMeta = {
+        id: '1',
+        status: 'unapproved',
+        metamaskNetworkId: currentNetworkId,
+        txParams: {
+          gasPrice: originalGasPrice,
+        },
+      }
+
+      const updatedMeta = clone(txMeta)
+
+      txStateManager.addTx(txMeta)
+      updatedMeta.txParams.gasPrice = desiredGasPrice
+      txStateManager.updateTx(updatedMeta)
+      let result = txStateManager.getTx('1')
+      assert.equal(result.txParams.gasPrice, desiredGasPrice, 'gas price updated')
+    })
+  })
+
+  describe('#getUnapprovedTxList', function () {
+    it('returns unapproved txs in a hash', function () {
+      txStateManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      const result = txStateManager.getUnapprovedTxList()
+      assert.equal(typeof result, 'object')
+      assert.equal(result['1'].status, 'unapproved')
+      assert.equal(result['2'], undefined)
+    })
+  })
+
+  describe('#getTx', function () {
+    it('returns a tx with the requested id', function () {
+      txStateManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      assert.equal(txStateManager.getTx('1').status, 'unapproved')
+      assert.equal(txStateManager.getTx('2').status, 'confirmed')
+    })
+  })
+
+  describe('#getFilteredTxList', function () {
+    it('returns a tx with the requested data', function () {
+      const txMetas = [
+        { id: 0, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
+        { id: 1, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
+        { id: 2, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
+        { id: 3, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
+        { id: 4, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
+        { id: 5, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
+        { id: 6, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
+        { id: 7, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
+        { id: 8, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
+        { id: 9, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
+      ]
+      txMetas.forEach((txMeta) => txStateManager.addTx(txMeta, noop))
+      let filterParams
+
+      filterParams = { status: 'unapproved', from: '0xaa' }
+      assert.equal(txStateManager.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      filterParams = { status: 'unapproved', to: '0xaa' }
+      assert.equal(txStateManager.getFilteredTxList(filterParams).length, 2, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      filterParams = { status: 'confirmed', from: '0xbb' }
+      assert.equal(txStateManager.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      filterParams = { status: 'confirmed' }
+      assert.equal(txStateManager.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      filterParams = { from: '0xaa' }
+      assert.equal(txStateManager.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      filterParams = { to: '0xaa' }
+      assert.equal(txStateManager.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+    })
+  })
+})
\ No newline at end of file
-- 
cgit v1.2.3


From 474a4e941f7bb5c19ac50d61c6c681a19278b52f Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Mon, 21 Aug 2017 11:51:34 -0700
Subject: fix tests

---
 test/unit/tx-state-manager-test.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-state-manager-test.js b/test/unit/tx-state-manager-test.js
index 998bbe152..464e50ee4 100644
--- a/test/unit/tx-state-manager-test.js
+++ b/test/unit/tx-state-manager-test.js
@@ -2,6 +2,7 @@ const assert = require('assert')
 const clone = require('clone')
 const ObservableStore = require('obs-store')
 const TxStateManager = require('../../app/scripts/lib/tx-state-manager')
+const txStateHistoryHelper = require('../../app/scripts/lib/tx-state-history-helper')
 const noop = () => true
 
 describe('TransactionStateManger', function () {
@@ -145,7 +146,9 @@ describe('TransactionStateManger', function () {
     it('replaces the tx with the same id', function () {
       txStateManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
       txStateManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txStateManager.updateTx({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: currentNetworkId, txParams: {} })
+      const txMeta = txStateManager.getTx('1')
+      txMeta.hash = 'foo'
+      txStateManager.updateTx(txMeta)
       let result = txStateManager.getTx('1')
       assert.equal(result.hash, 'foo')
     })
@@ -166,16 +169,16 @@ describe('TransactionStateManger', function () {
       const updatedMeta = clone(txMeta)
 
       txStateManager.addTx(txMeta)
-      const updatedTx = txController.getTx('1')
+      const updatedTx = txStateManager.getTx('1')
       // verify tx was initialized correctly
       assert.equal(updatedTx.history.length, 1, 'one history item (initial)')
       assert.equal(Array.isArray(updatedTx.history[0]), false, 'first history item is initial state')
       assert.deepEqual(updatedTx.history[0], txStateHistoryHelper.snapshotFromTxMeta(updatedTx), 'first history item is initial state')
       // modify value and updateTx
       updatedTx.txParams.gasPrice = desiredGasPrice
-      txController.updateTx(updatedTx)
+      txStateManager.updateTx(updatedTx)
       // check updated value
-      const result = txController.getTx('1')
+      const result = txStateManager.getTx('1')
       assert.equal(result.txParams.gasPrice, desiredGasPrice, 'gas price updated')
       // validate history was updated
       assert.equal(result.history.length, 2, 'two history items (initial + diff)')
-- 
cgit v1.2.3


From 4c554f32eca5ceda2d525b967075ec2b6ff41809 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 5 Sep 2017 20:13:43 -0700
Subject: remove #buildEthTxFromParams

---
 test/unit/tx-utils-test.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-utils-test.js b/test/unit/tx-utils-test.js
index 43128b977..dcfb9fb3d 100644
--- a/test/unit/tx-utils-test.js
+++ b/test/unit/tx-utils-test.js
@@ -1,6 +1,8 @@
 const assert = require('assert')
+const Transaction = require('ethereumjs-tx')
 const BN = require('bn.js')
 
+
 const { hexToBn, bnToHex } = require('../../app/scripts/lib/util')
 const TxUtils = require('../../app/scripts/lib/tx-utils')
 
@@ -28,7 +30,7 @@ describe('txUtils', function () {
         nonce: '0x3',
         chainId: 42,
       }
-      const ethTx = txUtils.buildEthTxFromParams(txParams)
+      const ethTx = new Transaction(txParams)
       assert.equal(ethTx.getChainId(), 42, 'chainId is set from tx params')
     })
   })
-- 
cgit v1.2.3


From 00bd5b143ffc13ac0a48f2049f61f26082af12c8 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 5 Sep 2017 20:33:50 -0700
Subject: rename tx-utils.js -> tx-gas-utils.js

---
 test/unit/tx-utils-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-utils-test.js b/test/unit/tx-utils-test.js
index dcfb9fb3d..8ca13412e 100644
--- a/test/unit/tx-utils-test.js
+++ b/test/unit/tx-utils-test.js
@@ -4,7 +4,7 @@ const BN = require('bn.js')
 
 
 const { hexToBn, bnToHex } = require('../../app/scripts/lib/util')
-const TxUtils = require('../../app/scripts/lib/tx-utils')
+const TxUtils = require('../../app/scripts/lib/tx-gas-utils')
 
 
 describe('txUtils', function () {
-- 
cgit v1.2.3


From 15c12ca4bb6996f43518630ded12c0d7be2d571b Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 5 Sep 2017 21:50:36 -0700
Subject: add better comments

---
 test/unit/tx-controller-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index fdbddac4b..f969752ec 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -5,7 +5,7 @@ const ObservableStore = require('obs-store')
 const clone = require('clone')
 const sinon = require('sinon')
 const TransactionController = require('../../app/scripts/controllers/transactions')
-const TxProvideUtils = require('../../app/scripts/lib/tx-utils')
+const TxGasUtils = require('../../app/scripts/lib/tx-gas-utils')
 const txStateHistoryHelper = require('../../app/scripts/lib/tx-state-history-helper')
 
 const noop = () => true
@@ -34,7 +34,7 @@ describe('Transaction Controller', function () {
       }),
     })
     txController.nonceTracker.getNonceLock = () => Promise.resolve({ nextNonce: 0, releaseLock: noop })
-    txController.txProviderUtils = new TxProvideUtils(txController.provider)
+    txController.txProviderUtils = new TxGasUtils(txController.provider)
   })
 
   describe('#newUnapprovedTransaction', function () {
-- 
cgit v1.2.3


From 714df393b406c515b0bb3abd4fcd8bde4ad53fde Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 6 Sep 2017 14:27:21 -0700
Subject: Add test template

---
 test/unit/pending-balance-test.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 test/unit/pending-balance-test.js

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
new file mode 100644
index 000000000..845d6d552
--- /dev/null
+++ b/test/unit/pending-balance-test.js
@@ -0,0 +1,37 @@
+const assert = require('assert')
+const PendingBalanceCalculator = require('../../app/scripts/lib/pending-balance-calculator')
+const MockTxGen = require('../lib/mock-tx-gen')
+const BN = require('ethereumjs-util').BN
+let providerResultStub = {}
+
+describe('PendingBalanceCalculator', function () {
+  let nonceTracker
+
+  describe('if you have no pending txs and one ether', function () {
+    const ether = '0x' + (new BN(1e18)).toString(16)
+
+    beforeEach(function () {
+      nonceTracker = generateNonceTrackerWith([], ether)
+    })
+
+    it('returns the network balance', function () {
+      const result = nonceTracker.getBalance()
+      assert.equal(result, ether, 'returns one ether')
+    })
+  })
+})
+
+function generateBalaneCalcWith (transactions, providerStub = '0x0') {
+  const getPendingTransactions = () => transactions
+  providerResultStub.result = providerStub
+  const provider = {
+    sendAsync: (_, cb) => { cb(undefined, providerResultStub) },
+    _blockTracker: {
+      getCurrentBlock: () => '0x11b568',
+    },
+  }
+  return new PendingBalanceCalculator({
+    provider,
+    getPendingTransactions,
+  })
+}
-- 
cgit v1.2.3


From f9a052deed8749a1c6dd544df561967a568749d9 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 6 Sep 2017 14:36:15 -0700
Subject: Add first passing balance calc test

---
 test/unit/pending-balance-test.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 845d6d552..dcf1926f0 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -8,21 +8,22 @@ describe('PendingBalanceCalculator', function () {
   let nonceTracker
 
   describe('if you have no pending txs and one ether', function () {
-    const ether = '0x' + (new BN(1e18)).toString(16)
+    const ether = '0x' + (new BN(String(1e18))).toString(16)
 
     beforeEach(function () {
-      nonceTracker = generateNonceTrackerWith([], ether)
+      nonceTracker = generateBalaneCalcWith([], ether)
     })
 
-    it('returns the network balance', function () {
-      const result = nonceTracker.getBalance()
-      assert.equal(result, ether, 'returns one ether')
+    it('returns the network balance', async function () {
+      const result = await nonceTracker.getBalance()
+      assert.equal(result, ether, `gave ${result} needed ${ether}`)
     })
   })
 })
 
 function generateBalaneCalcWith (transactions, providerStub = '0x0') {
-  const getPendingTransactions = () => transactions
+  const getPendingTransactions = () => Promise.resolve(transactions)
+  const getBalance = () => Promise.resolve(providerStub)
   providerResultStub.result = providerStub
   const provider = {
     sendAsync: (_, cb) => { cb(undefined, providerResultStub) },
@@ -31,7 +32,7 @@ function generateBalaneCalcWith (transactions, providerStub = '0x0') {
     },
   }
   return new PendingBalanceCalculator({
-    provider,
+    getBalance,
     getPendingTransactions,
   })
 }
-- 
cgit v1.2.3


From b6e8791bc2bc912d874edcc92fcf3c4ce5a9b72a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 11:59:15 -0700
Subject: test not passing

---
 test/unit/pending-balance-test.js | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index dcf1926f0..9077e8f14 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -5,20 +5,49 @@ const BN = require('ethereumjs-util').BN
 let providerResultStub = {}
 
 describe('PendingBalanceCalculator', function () {
-  let nonceTracker
+  let balanceCalculator
 
   describe('if you have no pending txs and one ether', function () {
     const ether = '0x' + (new BN(String(1e18))).toString(16)
 
     beforeEach(function () {
-      nonceTracker = generateBalaneCalcWith([], ether)
+      balanceCalculator = generateBalaneCalcWith([], ether)
     })
 
     it('returns the network balance', async function () {
-      const result = await nonceTracker.getBalance()
+      const result = await balanceCalculator.getBalance()
       assert.equal(result, ether, `gave ${result} needed ${ether}`)
     })
   })
+
+  describe('if you have a one ether pending tx and one ether', function () {
+    const ether = '0x' + (new BN(String(1e18))).toString(16)
+
+    beforeEach(function () {
+      const txGen = new MockTxGen()
+      pendingTxs = txGen.generate({
+        status: 'submitted',
+        txParams: {
+          value: ether,
+          gasPrice: '0x0',
+          gas: '0x0',
+        }
+      }, { count: 1 })
+
+      balanceCalculator = generateBalaneCalcWith(pendingTxs, ether)
+    })
+
+    it('returns the network balance', async function () {
+      console.log('one')
+      console.dir(balanceCalculator)
+      const result = await balanceCalculator.getBalance()
+      console.log('two')
+      console.dir(result)
+      assert.equal(result, '0x0', `gave ${result} needed '0x0'`)
+      return true
+    })
+
+  })
 })
 
 function generateBalaneCalcWith (transactions, providerStub = '0x0') {
-- 
cgit v1.2.3


From 40585744365c128d1f64c5bf93ee8cedc9e91dae Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:30:25 -0700
Subject: Add basic test for valueFor

---
 test/unit/pending-balance-test.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 9077e8f14..7f20270cb 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -4,11 +4,31 @@ const MockTxGen = require('../lib/mock-tx-gen')
 const BN = require('ethereumjs-util').BN
 let providerResultStub = {}
 
+const etherBn = new BN(String(1e18))
+const ether = '0x' + etherBn.toString(16)
+
 describe('PendingBalanceCalculator', function () {
   let balanceCalculator
 
+  describe('#valueFor(tx)', function () {
+    it('returns a BN for a given tx value', function () {
+      const txGen = new MockTxGen()
+      pendingTxs = txGen.generate({
+        status: 'submitted',
+        txParams: {
+          value: ether,
+          gasPrice: '0x0',
+          gas: '0x0',
+        }
+      }, { count: 1 })
+
+      const balanceCalculator = generateBalaneCalcWith([], '0x0')
+      const result = balanceCalculator.valueFor(pendingTxs[0])
+      assert.equal(result.toString(), etherBn.toString(), 'computes one ether')
+    })
+  })
+
   describe('if you have no pending txs and one ether', function () {
-    const ether = '0x' + (new BN(String(1e18))).toString(16)
 
     beforeEach(function () {
       balanceCalculator = generateBalaneCalcWith([], ether)
@@ -21,8 +41,6 @@ describe('PendingBalanceCalculator', function () {
   })
 
   describe('if you have a one ether pending tx and one ether', function () {
-    const ether = '0x' + (new BN(String(1e18))).toString(16)
-
     beforeEach(function () {
       const txGen = new MockTxGen()
       pendingTxs = txGen.generate({
@@ -40,6 +58,7 @@ describe('PendingBalanceCalculator', function () {
     it('returns the network balance', async function () {
       console.log('one')
       console.dir(balanceCalculator)
+      console.dir(balanceCalculator.getBalance.toString())
       const result = await balanceCalculator.getBalance()
       console.log('two')
       console.dir(result)
-- 
cgit v1.2.3


From 7b92268428cc2de4374bc669c524bb61959801f1 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:43:10 -0700
Subject: Fix valueFor test

---
 test/unit/pending-balance-test.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 7f20270cb..0937579e2 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -4,6 +4,7 @@ const MockTxGen = require('../lib/mock-tx-gen')
 const BN = require('ethereumjs-util').BN
 let providerResultStub = {}
 
+const zeroBn = new BN(0)
 const etherBn = new BN(String(1e18))
 const ether = '0x' + etherBn.toString(16)
 
@@ -22,7 +23,7 @@ describe('PendingBalanceCalculator', function () {
         }
       }, { count: 1 })
 
-      const balanceCalculator = generateBalaneCalcWith([], '0x0')
+      const balanceCalculator = generateBalanceCalcWith([], zeroBn)
       const result = balanceCalculator.valueFor(pendingTxs[0])
       assert.equal(result.toString(), etherBn.toString(), 'computes one ether')
     })
@@ -31,7 +32,7 @@ describe('PendingBalanceCalculator', function () {
   describe('if you have no pending txs and one ether', function () {
 
     beforeEach(function () {
-      balanceCalculator = generateBalaneCalcWith([], ether)
+      balanceCalculator = generateBalanceCalcWith([], zeroBn)
     })
 
     it('returns the network balance', async function () {
@@ -52,7 +53,7 @@ describe('PendingBalanceCalculator', function () {
         }
       }, { count: 1 })
 
-      balanceCalculator = generateBalaneCalcWith(pendingTxs, ether)
+      balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn)
     })
 
     it('returns the network balance', async function () {
@@ -69,7 +70,7 @@ describe('PendingBalanceCalculator', function () {
   })
 })
 
-function generateBalaneCalcWith (transactions, providerStub = '0x0') {
+function generateBalanceCalcWith (transactions, providerStub = zeroBn) {
   const getPendingTransactions = () => Promise.resolve(transactions)
   const getBalance = () => Promise.resolve(providerStub)
   providerResultStub.result = providerStub
-- 
cgit v1.2.3


From a95a3c7e4f4d1331394a7bf92a77678fe8087c04 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:47:27 -0700
Subject: Fix balance calc test

---
 test/unit/pending-balance-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 0937579e2..a9b0f7b66 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -32,7 +32,7 @@ describe('PendingBalanceCalculator', function () {
   describe('if you have no pending txs and one ether', function () {
 
     beforeEach(function () {
-      balanceCalculator = generateBalanceCalcWith([], zeroBn)
+      balanceCalculator = generateBalanceCalcWith([], etherBn)
     })
 
     it('returns the network balance', async function () {
-- 
cgit v1.2.3


From c616581001a7413a289b108b347005d53fb14732 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:47:52 -0700
Subject: Remove logs

---
 test/unit/pending-balance-test.js | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index a9b0f7b66..e1d5f9303 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -57,12 +57,7 @@ describe('PendingBalanceCalculator', function () {
     })
 
     it('returns the network balance', async function () {
-      console.log('one')
-      console.dir(balanceCalculator)
-      console.dir(balanceCalculator.getBalance.toString())
       const result = await balanceCalculator.getBalance()
-      console.log('two')
-      console.dir(result)
       assert.equal(result, '0x0', `gave ${result} needed '0x0'`)
       return true
     })
-- 
cgit v1.2.3


From 532a4040de191d455053aa11432dcb9b407c9bf4 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:52:25 -0700
Subject: Add test for computing gas price

---
 test/unit/pending-balance-test.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index e1d5f9303..3029a849c 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -27,6 +27,22 @@ describe('PendingBalanceCalculator', function () {
       const result = balanceCalculator.valueFor(pendingTxs[0])
       assert.equal(result.toString(), etherBn.toString(), 'computes one ether')
     })
+
+    it('calculates gas costs as well', function () {
+      const txGen = new MockTxGen()
+      pendingTxs = txGen.generate({
+        status: 'submitted',
+        txParams: {
+          value: '0x0',
+          gasPrice: '0x2',
+          gas: '0x3',
+        }
+      }, { count: 1 })
+
+      const balanceCalculator = generateBalanceCalcWith([], zeroBn)
+      const result = balanceCalculator.valueFor(pendingTxs[0])
+      assert.equal(result.toString(), '6', 'computes one ether')
+    })
   })
 
   describe('if you have no pending txs and one ether', function () {
-- 
cgit v1.2.3


From 65c00e9fbbb4496db4adee13c227e47ba85837c6 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:53:30 -0700
Subject: Improve test name

---
 test/unit/pending-balance-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 3029a849c..17be0306b 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -72,7 +72,7 @@ describe('PendingBalanceCalculator', function () {
       balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn)
     })
 
-    it('returns the network balance', async function () {
+    it('returns the subtracted result', async function () {
       const result = await balanceCalculator.getBalance()
       assert.equal(result, '0x0', `gave ${result} needed '0x0'`)
       return true
-- 
cgit v1.2.3


From 9b9df417246dbf332f0a7d8afadb664544ceb484 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Fri, 8 Sep 2017 14:24:40 -0700
Subject: more tests and craete a getPendingTransactions function

---
 test/unit/components/pending-tx-test.js |  3 ++-
 test/unit/tx-controller-test.js         | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/components/pending-tx-test.js b/test/unit/components/pending-tx-test.js
index 22a98bc93..906564558 100644
--- a/test/unit/components/pending-tx-test.js
+++ b/test/unit/components/pending-tx-test.js
@@ -24,7 +24,8 @@ describe('PendingTx', function () {
       'to': '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
       'value': '0xde0b6b3a7640000',
       gasPrice,
-      'gas': '0x7b0c'},
+      'gas': '0x7b0c',
+    },
     'gasLimitSpecified': false,
     'estimatedGas': '0x5208',
   }
diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index f969752ec..937ac55de 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -37,6 +37,28 @@ describe('Transaction Controller', function () {
     txController.txProviderUtils = new TxGasUtils(txController.provider)
   })
 
+  describe('#getState', function () {
+    it('should return a state object with the right keys and datat types', function (){
+      const exposedState = txController.getState()
+      assert('unapprovedTxs' in exposedState, 'state should have the key unapprovedTxs')
+      assert('selectedAddressTxList' in exposedState, 'state should have the key selectedAddressTxList')
+      assert(typeof exposedState.unapprovedTxs === 'object', 'should be an object')
+      assert(Array.isArray(exposedState.selectedAddressTxList), 'should be an array')
+    })
+  })
+
+  describe('#getUnapprovedTxCount', function () {
+    it('should return the number of unapproved txs', function () {
+      txController.txStateManager._saveTxList([
+        { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 2, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 3, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} },
+      ])
+      const unapprovedTxCount = txController.getUnapprovedTxCount()
+      assert.equal(unapprovedTxCount, 3, 'should be 3')
+    })
+  })
+
   describe('#newUnapprovedTransaction', function () {
     let stub, txMeta, txParams
     beforeEach(function () {
-- 
cgit v1.2.3


From 3ad67d1b14b5b56002cf34ab6dbb18d602705827 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 12 Sep 2017 09:59:59 -0700
Subject: match other controller patterns

---
 test/unit/tx-controller-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 937ac55de..479010b87 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -197,7 +197,7 @@ describe('Transaction Controller', function () {
         txParams: {}
       }
 
-      const eventNames = ['update', 'updateBadge', '1:unapproved']
+      const eventNames = ['updateBadge', '1:unapproved']
       const listeners = []
       eventNames.forEach((eventName) => {
         listeners.push(new Promise((resolve) => {
-- 
cgit v1.2.3


From 53a467cd1e2ab50168b06d36a98effcfd3db3a49 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 12 Sep 2017 15:06:19 -0700
Subject: Some progress

---
 test/unit/pending-balance-test.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 17be0306b..dde30fecc 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -96,3 +96,4 @@ function generateBalanceCalcWith (transactions, providerStub = zeroBn) {
     getPendingTransactions,
   })
 }
+
-- 
cgit v1.2.3


From 59909601b887b2ed8473bea5a28b852668b2804e Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Wed, 13 Sep 2017 14:07:22 -0700
Subject: add test for pendingTxCount

---
 test/unit/tx-controller-test.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 479010b87..47bfe66f8 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -59,6 +59,19 @@ describe('Transaction Controller', function () {
     })
   })
 
+  describe('#getPendingTxCount', function () {
+    it('should return the number of pending txs', function () {
+      txController.txStateManager._saveTxList([
+        { id: 1, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 2, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 3, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {} },
+      ])
+      const pendingTxCount = txController.getPendingTxCount()
+      assert.equal(pendingTxCount, 3, 'should be 3')
+    })
+  })
+
+
   describe('#newUnapprovedTransaction', function () {
     let stub, txMeta, txParams
     beforeEach(function () {
-- 
cgit v1.2.3


From c9585f166f3aebea29e7214026a942eb18e4884a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 13 Sep 2017 15:21:18 -0700
Subject: Fix test

---
 test/unit/components/pending-tx-test.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test/unit')

diff --git a/test/unit/components/pending-tx-test.js b/test/unit/components/pending-tx-test.js
index 22a98bc93..fdade1042 100644
--- a/test/unit/components/pending-tx-test.js
+++ b/test/unit/components/pending-tx-test.js
@@ -34,10 +34,15 @@ describe('PendingTx', function () {
     const renderer = ReactTestUtils.createRenderer()
     const newGasPrice = '0x77359400'
 
+    const computedBalances = {}
+    computedBalances[Object.keys(identities)[0]] = {
+      ethBalance: '0x00000000000000056bc75e2d63100000',
+    }
     const props = {
       identities,
       accounts: identities,
       txData,
+      computedBalances,
       sendTransaction: (txMeta, event) => {
         // Assert changes:
         const result = ethUtil.addHexPrefix(txMeta.txParams.gasPrice)
-- 
cgit v1.2.3


From 4e57cdf8b35c0bde571fb108b76d70ca251644f7 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 19 Sep 2017 10:53:56 -0700
Subject: stub platform

---
 test/unit/metamask-controller-test.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/unit')

diff --git a/test/unit/metamask-controller-test.js b/test/unit/metamask-controller-test.js
index 5ee0a6c84..ef6cae758 100644
--- a/test/unit/metamask-controller-test.js
+++ b/test/unit/metamask-controller-test.js
@@ -10,6 +10,7 @@ describe('MetaMaskController', function () {
     showUnconfirmedMessage: noop,
     unlockAccountMessage: noop,
     showUnapprovedTx: noop,
+    platform: {},
     // initial state
     initState: clone(firstTimeState),
   })
-- 
cgit v1.2.3


From e9043f22dfa7856e3360b312ce480e71f36d9381 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 21 Sep 2017 15:47:25 -0700
Subject: Allow custom encryptor to be passed to MetaMaskController and
 KeyringControllers.

---
 test/unit/keyring-controller-test.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index 2d9a53723..8d0d75f12 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -27,12 +27,9 @@ describe('KeyringController', function () {
       ethStore: {
         addAccount (acct) { accounts.push(ethUtil.addHexPrefix(acct)) },
       },
+      encryptor: mockEncryptor,
     })
 
-    // Stub out the browser crypto for a mock encryptor.
-    // Browser crypto is tested in the integration test suite.
-    keyringController.encryptor = mockEncryptor
-
     keyringController.createNewVaultAndKeychain(password)
     .then(function (newState) {
       newState
-- 
cgit v1.2.3


From f128240e7f877280fa59bf22f2ea8285bb467022 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 22 Sep 2017 14:19:14 -0700
Subject: Fix test references

---
 test/unit/keyring-controller-test.js | 2 +-
 test/unit/tx-controller-test.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index 2d9a53723..34c314639 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -24,7 +24,7 @@ describe('KeyringController', function () {
         getTxList: () => [],
         getUnapprovedTxList: () => [],
       },
-      ethStore: {
+      accountTracker: {
         addAccount (acct) { accounts.push(ethUtil.addHexPrefix(acct)) },
       },
     })
diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 7bb193242..7b875db66 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -27,7 +27,7 @@ describe('Transaction Controller', function () {
       networkStore: new ObservableStore(currentNetworkId),
       txHistoryLimit: 10,
       blockTracker: { getCurrentBlock: noop, on: noop, once: noop },
-      ethStore: { getState: noop },
+      accountTracker: { getState: noop },
       signTransaction: (ethTx) => new Promise((resolve) => {
         ethTx.sign(privKey)
         resolve()
@@ -431,4 +431,4 @@ describe('Transaction Controller', function () {
       }).catch(done)
     })
   })
-})
\ No newline at end of file
+})
-- 
cgit v1.2.3


From 443b1a8eb7883b6799692ddc24d0555d49bd1787 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 22 Sep 2017 14:38:40 -0700
Subject: Remove keyring controller from project

---
 test/unit/keyring-controller-test.js | 164 -----------------------------------
 1 file changed, 164 deletions(-)
 delete mode 100644 test/unit/keyring-controller-test.js

(limited to 'test/unit')

diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
deleted file mode 100644
index 135edf365..000000000
--- a/test/unit/keyring-controller-test.js
+++ /dev/null
@@ -1,164 +0,0 @@
-const assert = require('assert')
-const KeyringController = require('../../app/scripts/keyring-controller')
-const configManagerGen = require('../lib/mock-config-manager')
-const ethUtil = require('ethereumjs-util')
-const BN = ethUtil.BN
-const mockEncryptor = require('../lib/mock-encryptor')
-const sinon = require('sinon')
-
-describe('KeyringController', function () {
-  let keyringController
-  const password = 'password123'
-  const seedWords = 'puzzle seed penalty soldier say clay field arctic metal hen cage runway'
-  const addresses = ['eF35cA8EbB9669A35c31b5F6f249A9941a812AC1'.toLowerCase()]
-  const accounts = []
-  // let originalKeystore
-
-  beforeEach(function (done) {
-    this.sinon = sinon.sandbox.create()
-    window.localStorage = {} // Hacking localStorage support into JSDom
-
-    keyringController = new KeyringController({
-      configManager: configManagerGen(),
-      txManager: {
-        getTxList: () => [],
-        getUnapprovedTxList: () => [],
-      },
-      accountTracker: {
-        addAccount (acct) { accounts.push(ethUtil.addHexPrefix(acct)) },
-      },
-      encryptor: mockEncryptor,
-    })
-
-    keyringController.createNewVaultAndKeychain(password)
-    .then(function (newState) {
-      newState
-      done()
-    })
-    .catch((err) => {
-      done(err)
-    })
-  })
-
-  afterEach(function () {
-    // Cleanup mocks
-    this.sinon.restore()
-  })
-
-  describe('#createNewVaultAndKeychain', function () {
-    this.timeout(10000)
-
-    it('should set a vault on the configManager', function (done) {
-      keyringController.store.updateState({ vault: null })
-      assert(!keyringController.store.getState().vault, 'no previous vault')
-      keyringController.createNewVaultAndKeychain(password)
-      .then(() => {
-        const vault = keyringController.store.getState().vault
-        assert(vault, 'vault created')
-        done()
-      })
-      .catch((reason) => {
-        done(reason)
-      })
-    })
-  })
-
-  describe('#restoreKeyring', function () {
-    it(`should pass a keyring's serialized data back to the correct type.`, function (done) {
-      const mockSerialized = {
-        type: 'HD Key Tree',
-        data: {
-          mnemonic: seedWords,
-          numberOfAccounts: 1,
-        },
-      }
-      const mock = this.sinon.mock(keyringController)
-
-      mock.expects('getBalanceAndNickname')
-      .exactly(1)
-
-      keyringController.restoreKeyring(mockSerialized)
-      .then((keyring) => {
-        assert.equal(keyring.wallets.length, 1, 'one wallet restored')
-        return keyring.getAccounts()
-      })
-      .then((accounts) => {
-        assert.equal(accounts[0], addresses[0])
-        mock.verify()
-        done()
-      })
-      .catch((reason) => {
-        done(reason)
-      })
-    })
-  })
-
-  describe('#createNickname', function () {
-    it('should add the address to the identities hash', function () {
-      const fakeAddress = '0x12345678'
-      keyringController.createNickname(fakeAddress)
-      const identities = keyringController.memStore.getState().identities
-      const identity = identities[fakeAddress]
-      assert.equal(identity.address, fakeAddress)
-    })
-  })
-
-  describe('#saveAccountLabel', function () {
-    it('sets the nickname', function (done) {
-      const account = addresses[0]
-      var nick = 'Test nickname'
-      const identities = keyringController.memStore.getState().identities
-      identities[ethUtil.addHexPrefix(account)] = {}
-      keyringController.memStore.updateState({ identities })
-      keyringController.saveAccountLabel(account, nick)
-      .then((label) => {
-        try {
-          assert.equal(label, nick)
-          const persisted = keyringController.store.getState().walletNicknames[account]
-          assert.equal(persisted, nick)
-          done()
-        } catch (err) {
-          done()
-        }
-      })
-      .catch((reason) => {
-        done(reason)
-      })
-    })
-  })
-
-  describe('#getAccounts', function () {
-    it('returns the result of getAccounts for each keyring', function (done) {
-      keyringController.keyrings = [
-        { getAccounts () { return Promise.resolve([1, 2, 3]) } },
-        { getAccounts () { return Promise.resolve([4, 5, 6]) } },
-      ]
-
-      keyringController.getAccounts()
-      .then((result) => {
-        assert.deepEqual(result, [1, 2, 3, 4, 5, 6])
-        done()
-      })
-    })
-  })
-
-  describe('#addGasBuffer', function () {
-    it('adds 100k gas buffer to estimates', function () {
-      const gas = '0x04ee59' // Actual estimated gas example
-      const tooBigOutput = '0x80674f9' // Actual bad output
-      const bnGas = new BN(ethUtil.stripHexPrefix(gas), 16)
-      const correctBuffer = new BN('100000', 10)
-      const correct = bnGas.add(correctBuffer)
-
-      // const tooBig = new BN(tooBigOutput, 16)
-      const result = keyringController.addGasBuffer(gas)
-      const bnResult = new BN(ethUtil.stripHexPrefix(result), 16)
-
-      assert.equal(result.indexOf('0x'), 0, 'included hex prefix')
-      assert(bnResult.gt(bnGas), 'Estimate increased in value.')
-      assert.equal(bnResult.sub(bnGas).toString(10), '100000', 'added 100k gas')
-      assert.equal(result, '0x' + correct.toString(16), 'Added the right amount')
-      assert.notEqual(result, tooBigOutput, 'not that bad estimate')
-    })
-  })
-})
-- 
cgit v1.2.3


From d4578836c99bfcdb66a6c989a7ecf79a896a2dc8 Mon Sep 17 00:00:00 2001
From: tmashuang <tmashuang@gmail.com>
Date: Fri, 22 Sep 2017 16:15:18 -0700
Subject: Most of transaction controller tests

---
 test/unit/tx-controller-test.js | 192 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 180 insertions(+), 12 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 47bfe66f8..e1e4ae8fe 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -7,12 +7,13 @@ const sinon = require('sinon')
 const TransactionController = require('../../app/scripts/controllers/transactions')
 const TxGasUtils = require('../../app/scripts/lib/tx-gas-utils')
 const txStateHistoryHelper = require('../../app/scripts/lib/tx-state-history-helper')
+const TxStateManager = require('../../app/scripts/lib/tx-state-manager')
+const { createStubedProvider } = require('../stub/provider')
 
 const noop = () => true
 const currentNetworkId = 42
 const otherNetworkId = 36
 const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex')
-const { createStubedProvider } = require('../stub/provider')
 
 
 describe('Transaction Controller', function () {
@@ -34,11 +35,11 @@ describe('Transaction Controller', function () {
       }),
     })
     txController.nonceTracker.getNonceLock = () => Promise.resolve({ nextNonce: 0, releaseLock: noop })
-    txController.txProviderUtils = new TxGasUtils(txController.provider)
+    txController.txProviderUtils = new TxGasUtils(txController.provider)  
   })
 
   describe('#getState', function () {
-    it('should return a state object with the right keys and datat types', function (){
+    it('should return a state object with the right keys and datat types', function () {
       const exposedState = txController.getState()
       assert('unapprovedTxs' in exposedState, 'state should have the key unapprovedTxs')
       assert('selectedAddressTxList' in exposedState, 'state should have the key selectedAddressTxList')
@@ -71,13 +72,32 @@ describe('Transaction Controller', function () {
     })
   })
 
+  describe('#getConfirmedTransactions', function () {
+    let address
+    beforeEach(function () {
+      address = '0xc684832530fcbddae4b4230a47e991ddcec2831d'
+      const txParams = {
+        'from': address,
+        'to': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
+      }
+      txController.txStateManager._saveTxList([
+        {id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 2, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 3, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams},
+      ])
+    })
+    it('should return the number of confirmed txs', function () {
+      assert.equal(txController.nonceTracker.getConfirmedTransactions(address).length, 3)
+    })
+  })
+
 
   describe('#newUnapprovedTransaction', function () {
     let stub, txMeta, txParams
     beforeEach(function () {
       txParams = {
-        'from':'0xc684832530fcbddae4b4230a47e991ddcec2831d',
-        'to':'0xc684832530fcbddae4b4230a47e991ddcec2831d',
+        'from': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
+        'to': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
       },
       txMeta = {
         status: 'unapproved',
@@ -157,10 +177,10 @@ describe('Transaction Controller', function () {
 
   describe('#addTxDefaults', function () {
     it('should add the tx defaults if their are none', function (done) {
-      let txMeta = {
+      const txMeta = {
         'txParams': {
-          'from':'0xc684832530fcbddae4b4230a47e991ddcec2831d',
-          'to':'0xc684832530fcbddae4b4230a47e991ddcec2831d',
+          'from': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
+          'to': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
         },
       }
         providerResultStub.eth_gasPrice = '4a817c800'
@@ -168,7 +188,7 @@ describe('Transaction Controller', function () {
         providerResultStub.eth_estimateGas = '5209'
       txController.addTxDefaults(txMeta)
       .then((txMetaWithDefaults) => {
-        assert(txMetaWithDefaults.txParams.value, '0x0','should have added 0x0 as the value')
+        assert(txMetaWithDefaults.txParams.value, '0x0', 'should have added 0x0 as the value')
         assert(txMetaWithDefaults.txParams.gasPrice, 'should have added the gas price')
         assert(txMetaWithDefaults.txParams.gas, 'should have added the gas field')
         done()
@@ -177,6 +197,16 @@ describe('Transaction Controller', function () {
     })
   })
 
+  xdescribe('#updateAndApprovedTransaction', function () {
+    it('should update txMeta and approve status for Tx', async function () {
+      txController.txStateManager.addTx({ id: 0, status: 'unapproved', txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d', nonce: '0x1', value: '0xfffff' }, metamaskNetworkId: currentNetworkId })
+      const txMeta = txController.txStateManager.getTx(0)
+      txMeta.value = '0xffffe'
+      provider.eth_sendRawTransaction = 0x7f9fade1c0d57a7af66ab4ead79fade1c0d57a7af66ab4ead7c2c2eb7b11a91385
+      await txController.updateAndApproveTransaction(txMeta)
+    })
+  })
+
   describe('#validateTxParams', function () {
     it('does not throw for positive values', function (done) {
       var sample = {
@@ -205,9 +235,8 @@ describe('Transaction Controller', function () {
       const txMeta = {
         id: '1',
         status: 'unapproved',
-        id: 1,
         metamaskNetworkId: currentNetworkId,
-        txParams: {}
+        txParams: {},
       }
 
       const eventNames = ['updateBadge', '1:unapproved']
@@ -286,4 +315,143 @@ describe('Transaction Controller', function () {
       }).catch(done)
     })
   })
-})
\ No newline at end of file
+
+  describe('#getChainId', function () {
+    it('returns 0 when the chainId is NaN', async function () {
+      txController.networkStore = new ObservableStore('hello')
+      assert.equal(txController.getChainId(), 0)
+    })
+  })
+
+  describe('#publishTransaction', async function () {
+    beforeEach(function () {
+      const txMeta = [
+        { id: 0, status: 'unapproved', txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d', nonce: '0x1', value: '0xfffff' }, rawTx: 'f8498080808080801ca00255b75b550cf112e18fd699f27d043d85348c29d7e8fd234799db890f7c272da0238121aed40c3141e63aae5335aaa3c9711d4907f28071f81f8d055b9f8435e0', metamaskNetworkId: currentNetworkId },
+      ]
+      txController.txStateManager.addTx(txMeta)
+    })
+
+    it('should update rawTx of a transaction', async function () {
+      txController.publishTransaction(0, 'f84c01808080830fffff801ca0e23554ce6f82186402dcdcfff377793fdfa8a872a5670c0ffc002c9cd2f6827aa02a83dfce20aef4064a55320bda47394043af3cbfa63c4e029c54ba6281dcc70e')
+    })
+  })
+
+  describe('#cancelTransaction', function () {
+    beforeEach(function () {
+      const txMetas = [
+        { id: 0, status: 'unapproved', txParams: { }, metamaskNetworkId: currentNetworkId },
+        { id: 1, status: 'rejected', txParams: { }, metamaskNetworkId: currentNetworkId },
+        { id: 2, status: 'approved', txParams: { }, metamaskNetworkId: currentNetworkId },
+        { id: 3, status: 'signed', txParams: { }, metamaskNetworkId: currentNetworkId },
+        { id: 4, status: 'submitted', txParams: { }, metamaskNetworkId: currentNetworkId },
+        { id: 5, status: 'confirmed', txParams: { }, metamaskNetworkId: currentNetworkId },
+        { id: 6, status: 'failed', txParams: { }, metamaskNetworkId: currentNetworkId },
+      ]
+      txMetas.forEach((txMeta) => txController.txStateManager.addTx(txMeta))
+    })
+
+    it('should set the transaction to rejected from unapproved', async function () {
+      await txController.cancelTransaction(0)
+      assert(txController.txStateManager.getTx(0).status, 'rejected')
+    })
+
+    it('should set the transaction to rejected from rejected', async function () {
+      await txController.cancelTransaction(1)
+      assert(txController.txStateManager.getTx(1).status, 'rejected')
+    })
+
+    it('should set the transaction to rejected from approved', async function () {
+      await txController.cancelTransaction(2)
+      assert(txController.txStateManager.getTx(2).status, 'rejected')
+    })
+
+    it('should set the transaction to rejected from signed', async function () {
+      await txController.cancelTransaction(3)
+      assert(txController.txStateManager.getTx(3).status, 'rejected')
+    })
+
+    it('should set the transaction to rejected from submitted', async function () {
+      await txController.cancelTransaction(4)
+      assert(txController.txStateManager.getTx(4).status, 'rejected')
+    })
+
+    it('should set the transaction to rejected from confirmed', async function () {
+      await txController.cancelTransaction(5)
+      assert(txController.txStateManager.getTx(5).status, 'rejected')
+    })
+
+    it('should set the transaction to rejected from failed', async function () {
+      await txController.cancelTransaction(6)
+      assert(txController.txStateManager.getTx(6).status, 'rejected')
+    })
+
+  })
+
+  describe('#publishTransaction', function () {
+    let replaceRawTx, rawTx, hash, txMeta
+    beforeEach(function () {
+      rawTx = 'f86c808504a817c800827b0d940c62bb85faa3311a998d3aba8098c1235c564966880de0b6b3a7640000802aa08ff665feb887a25d4099e40e11f0fef93ee9608f404bd3f853dd9e84ed3317a6a02ec9d3d1d6e176d4d2593dd760e74ccac753e6a0ea0d00cc9789d0d7ff1f471d'
+      replaceRawTx = 'f84c01808080830fffff801ca0e23554ce6f82186402dcdcfff377793fdfa8a872a5670c0ffc002c9cd2f6827aa02a83dfce20aef4064a55320bda47394043af3cbfa63c4e029c54ba6281dcc70e'
+      txMeta = {
+        id: 1,
+        status: 'approved',
+        txParams: {},
+        rawTx,
+        hash,
+        metamaskNetworkId: currentNetworkId,
+      }
+      providerResultStub.eth_sendRawTransaction = '0x2a5523c6fa98b47b7d9b6c8320179785150b42a16bcff36b398c5062b65657e8'
+    })
+    it('should publish a tx, updates the rawTx when provided a one', async function () {
+      txController.txStateManager.addTx(txMeta)
+      await txController.publishTransaction(txMeta.id, replaceRawTx)
+      txController.setTxHash(1, '0x2a5523c6fa98b47b7d9b6c8320179785150b42a16bcff36b398c5062b65657e8')
+      assert.equal(txController.txStateManager.getTx(1).rawTx, replaceRawTx)
+      assert.notEqual(txController.txStateManager.getTx(1).rawTx, rawTx)
+    })
+  })
+
+  describe('#getBalance', function () {
+    it('gets balance', function () {
+      sinon.stub(txController.ethStore, 'getState').callsFake(() => {
+        return {
+          accounts: {
+            '0x1678a085c290ebd122dc42cba69373b5953b831d': {
+              address: '0x1678a085c290ebd122dc42cba69373b5953b831d',
+              balance: '0x00000000000000056bc75e2d63100000',
+              code: '0x',
+              nonce: '0x0',
+            },
+            '0xc684832530fcbddae4b4230a47e991ddcec2831d': {
+              address: '0xc684832530fcbddae4b4230a47e991ddcec2831d',
+              balance: '0x0',
+              code: '0x',
+              nonce: '0x0',
+            },
+          },
+        }
+      })
+      assert.equal(txController.pendingTxTracker.getBalance('0x1678a085c290ebd122dc42cba69373b5953b831d'), '0x00000000000000056bc75e2d63100000')
+      assert.equal(txController.pendingTxTracker.getBalance('0xc684832530fcbddae4b4230a47e991ddcec2831d'), '0x0')
+    })
+  })
+
+  describe('#getPendingTransactions', function () {
+    beforeEach(function () {
+      txController.txStateManager._saveTxList([
+        { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 2, status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 3, status: 'approved', metamaskNetworkId: currentNetworkId, txParams: {} },        
+        { id: 4, status: 'signed', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 5, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 6, status: 'confimed', metamaskNetworkId: currentNetworkId, txParams: {} },
+        { id: 7, status: 'failed', metamaskNetworkId: currentNetworkId, txParams: {} },
+      ])
+    })
+    it('should show only submitted transactions as pending transasction', function () {
+      assert(txController.pendingTxTracker.getPendingTransactions().length, 1)
+      assert(txController.pendingTxTracker.getPendingTransactions()[0].status, 'submitted')
+    })
+  })
+
+})
-- 
cgit v1.2.3


From 20fea3f1dee33455842d9c2ac7e620d3321b6011 Mon Sep 17 00:00:00 2001
From: tmashuang <tmashuang@gmail.com>
Date: Mon, 25 Sep 2017 10:47:36 -0700
Subject: Remove pending updateAndApprovedTransaction test

---
 test/unit/tx-controller-test.js | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index e1e4ae8fe..f6b41f2bb 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -197,16 +197,6 @@ describe('Transaction Controller', function () {
     })
   })
 
-  xdescribe('#updateAndApprovedTransaction', function () {
-    it('should update txMeta and approve status for Tx', async function () {
-      txController.txStateManager.addTx({ id: 0, status: 'unapproved', txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d', nonce: '0x1', value: '0xfffff' }, metamaskNetworkId: currentNetworkId })
-      const txMeta = txController.txStateManager.getTx(0)
-      txMeta.value = '0xffffe'
-      provider.eth_sendRawTransaction = 0x7f9fade1c0d57a7af66ab4ead79fade1c0d57a7af66ab4ead7c2c2eb7b11a91385
-      await txController.updateAndApproveTransaction(txMeta)
-    })
-  })
-
   describe('#validateTxParams', function () {
     it('does not throw for positive values', function (done) {
       var sample = {
-- 
cgit v1.2.3


From 8cd7329c91b047ef15c81b164075ea6c1d15b0df Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 25 Sep 2017 14:36:49 -0700
Subject: Implemented feedback

---
 test/unit/pending-balance-test.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index dde30fecc..5048d487b 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -11,7 +11,7 @@ const ether = '0x' + etherBn.toString(16)
 describe('PendingBalanceCalculator', function () {
   let balanceCalculator
 
-  describe('#valueFor(tx)', function () {
+  describe('#calculateMaxCost(tx)', function () {
     it('returns a BN for a given tx value', function () {
       const txGen = new MockTxGen()
       pendingTxs = txGen.generate({
@@ -24,7 +24,7 @@ describe('PendingBalanceCalculator', function () {
       }, { count: 1 })
 
       const balanceCalculator = generateBalanceCalcWith([], zeroBn)
-      const result = balanceCalculator.valueFor(pendingTxs[0])
+      const result = balanceCalculator.calculateMaxCost(pendingTxs[0])
       assert.equal(result.toString(), etherBn.toString(), 'computes one ether')
     })
 
@@ -40,8 +40,8 @@ describe('PendingBalanceCalculator', function () {
       }, { count: 1 })
 
       const balanceCalculator = generateBalanceCalcWith([], zeroBn)
-      const result = balanceCalculator.valueFor(pendingTxs[0])
-      assert.equal(result.toString(), '6', 'computes one ether')
+      const result = balanceCalculator.calculateMaxCost(pendingTxs[0])
+      assert.equal(result.toString(), '6', 'computes 6 wei of gas')
     })
   })
 
@@ -82,15 +82,9 @@ describe('PendingBalanceCalculator', function () {
 })
 
 function generateBalanceCalcWith (transactions, providerStub = zeroBn) {
-  const getPendingTransactions = () => Promise.resolve(transactions)
-  const getBalance = () => Promise.resolve(providerStub)
-  providerResultStub.result = providerStub
-  const provider = {
-    sendAsync: (_, cb) => { cb(undefined, providerResultStub) },
-    _blockTracker: {
-      getCurrentBlock: () => '0x11b568',
-    },
-  }
+  const getPendingTransactions = async () => transactions
+  const getBalance = async () => providerStub
+
   return new PendingBalanceCalculator({
     getBalance,
     getPendingTransactions,
-- 
cgit v1.2.3


From ff6f7b52e4b5397daef74695894e0cdad22fe273 Mon Sep 17 00:00:00 2001
From: tmashuang <tmashuang@gmail.com>
Date: Mon, 25 Sep 2017 19:47:03 -0700
Subject: Clean up transactionController tests

---
 test/unit/tx-controller-test.js | 124 +++++++++++++++++-----------------------
 1 file changed, 53 insertions(+), 71 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index f6b41f2bb..13056417c 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -2,12 +2,9 @@ const assert = require('assert')
 const ethUtil = require('ethereumjs-util')
 const EthTx = require('ethereumjs-tx')
 const ObservableStore = require('obs-store')
-const clone = require('clone')
 const sinon = require('sinon')
 const TransactionController = require('../../app/scripts/controllers/transactions')
 const TxGasUtils = require('../../app/scripts/lib/tx-gas-utils')
-const txStateHistoryHelper = require('../../app/scripts/lib/tx-state-history-helper')
-const TxStateManager = require('../../app/scripts/lib/tx-state-manager')
 const { createStubedProvider } = require('../stub/provider')
 
 const noop = () => true
@@ -17,7 +14,7 @@ const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f3
 
 
 describe('Transaction Controller', function () {
-  let txController, engine, provider, providerResultStub
+  let txController, provider, providerResultStub
 
   beforeEach(function () {
     providerResultStub = {}
@@ -81,11 +78,18 @@ describe('Transaction Controller', function () {
         'to': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
       }
       txController.txStateManager._saveTxList([
+        {id: 0, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams},
         {id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams},
         {id: 2, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams},
-        {id: 3, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 3, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 4, status: 'rejected', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 5, status: 'approved', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 6, status: 'signed', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 7, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams},
+        {id: 8, status: 'failed', metamaskNetworkId: currentNetworkId, txParams},
       ])
     })
+
     it('should return the number of confirmed txs', function () {
       assert.equal(txController.nonceTracker.getConfirmedTransactions(address).length, 3)
     })
@@ -98,7 +102,7 @@ describe('Transaction Controller', function () {
       txParams = {
         'from': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
         'to': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
-      },
+      }
       txMeta = {
         status: 'unapproved',
         id: 1,
@@ -306,98 +310,76 @@ describe('Transaction Controller', function () {
     })
   })
 
-  describe('#getChainId', function () {
-    it('returns 0 when the chainId is NaN', async function () {
-      txController.networkStore = new ObservableStore('hello')
-      assert.equal(txController.getChainId(), 0)
-    })
-  })
-
-  describe('#publishTransaction', async function () {
+  describe('#updateAndApproveTransaction', function () {
+    let txMeta
     beforeEach(function () {
-      const txMeta = [
-        { id: 0, status: 'unapproved', txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d', nonce: '0x1', value: '0xfffff' }, rawTx: 'f8498080808080801ca00255b75b550cf112e18fd699f27d043d85348c29d7e8fd234799db890f7c272da0238121aed40c3141e63aae5335aaa3c9711d4907f28071f81f8d055b9f8435e0', metamaskNetworkId: currentNetworkId },
-      ]
+      txMeta = {
+        id: 1,
+        status: 'unapproved',
+        txParams: {
+          from: '0xc684832530fcbddae4b4230a47e991ddcec2831d',
+          to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
+          gasPrice: '0x77359400',
+          gas: '0x7b0d',
+          nonce: '0x4b',
+        },
+        metamaskNetworkId: currentNetworkId,
+      }
+    })
+    it('should update and approve transactions', function () {
       txController.txStateManager.addTx(txMeta)
+      txController.updateAndApproveTransaction(txMeta)
+      const tx = txController.txStateManager.getTx(1)
+      assert.equal(tx.status, 'approved')
     })
+  })
 
-    it('should update rawTx of a transaction', async function () {
-      txController.publishTransaction(0, 'f84c01808080830fffff801ca0e23554ce6f82186402dcdcfff377793fdfa8a872a5670c0ffc002c9cd2f6827aa02a83dfce20aef4064a55320bda47394043af3cbfa63c4e029c54ba6281dcc70e')
+  describe('#getChainId', function () {
+    it('returns 0 when the chainId is NaN', function () {
+      txController.networkStore = new ObservableStore(NaN)
+      assert.equal(txController.getChainId(), 0)
     })
   })
 
   describe('#cancelTransaction', function () {
     beforeEach(function () {
-      const txMetas = [
-        { id: 0, status: 'unapproved', txParams: { }, metamaskNetworkId: currentNetworkId },
-        { id: 1, status: 'rejected', txParams: { }, metamaskNetworkId: currentNetworkId },
-        { id: 2, status: 'approved', txParams: { }, metamaskNetworkId: currentNetworkId },
-        { id: 3, status: 'signed', txParams: { }, metamaskNetworkId: currentNetworkId },
-        { id: 4, status: 'submitted', txParams: { }, metamaskNetworkId: currentNetworkId },
-        { id: 5, status: 'confirmed', txParams: { }, metamaskNetworkId: currentNetworkId },
-        { id: 6, status: 'failed', txParams: { }, metamaskNetworkId: currentNetworkId },
-      ]
-      txMetas.forEach((txMeta) => txController.txStateManager.addTx(txMeta))
+      txController.txStateManager._saveTxList([
+        { id: 0, status: 'unapproved', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+        { id: 1, status: 'rejected', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+        { id: 2, status: 'approved', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+        { id: 3, status: 'signed', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+        { id: 4, status: 'submitted', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+        { id: 5, status: 'confirmed', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+        { id: 6, status: 'failed', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+      ])
     })
 
     it('should set the transaction to rejected from unapproved', async function () {
       await txController.cancelTransaction(0)
-      assert(txController.txStateManager.getTx(0).status, 'rejected')
-    })
-
-    it('should set the transaction to rejected from rejected', async function () {
-      await txController.cancelTransaction(1)
-      assert(txController.txStateManager.getTx(1).status, 'rejected')
-    })
-
-    it('should set the transaction to rejected from approved', async function () {
-      await txController.cancelTransaction(2)
-      assert(txController.txStateManager.getTx(2).status, 'rejected')
-    })
-
-    it('should set the transaction to rejected from signed', async function () {
-      await txController.cancelTransaction(3)
-      assert(txController.txStateManager.getTx(3).status, 'rejected')
-    })
-
-    it('should set the transaction to rejected from submitted', async function () {
-      await txController.cancelTransaction(4)
-      assert(txController.txStateManager.getTx(4).status, 'rejected')
-    })
-
-    it('should set the transaction to rejected from confirmed', async function () {
-      await txController.cancelTransaction(5)
-      assert(txController.txStateManager.getTx(5).status, 'rejected')
-    })
-
-    it('should set the transaction to rejected from failed', async function () {
-      await txController.cancelTransaction(6)
-      assert(txController.txStateManager.getTx(6).status, 'rejected')
+      assert.equal(txController.txStateManager.getTx(0).status, 'rejected')
     })
 
   })
 
   describe('#publishTransaction', function () {
-    let replaceRawTx, rawTx, hash, txMeta
+    let hash, txMeta
     beforeEach(function () {
-      rawTx = 'f86c808504a817c800827b0d940c62bb85faa3311a998d3aba8098c1235c564966880de0b6b3a7640000802aa08ff665feb887a25d4099e40e11f0fef93ee9608f404bd3f853dd9e84ed3317a6a02ec9d3d1d6e176d4d2593dd760e74ccac753e6a0ea0d00cc9789d0d7ff1f471d'
-      replaceRawTx = 'f84c01808080830fffff801ca0e23554ce6f82186402dcdcfff377793fdfa8a872a5670c0ffc002c9cd2f6827aa02a83dfce20aef4064a55320bda47394043af3cbfa63c4e029c54ba6281dcc70e'
+      hash = '0x2a5523c6fa98b47b7d9b6c8320179785150b42a16bcff36b398c5062b65657e8'
       txMeta = {
         id: 1,
-        status: 'approved',
+        status: 'unapproved',
         txParams: {},
-        rawTx,
-        hash,
         metamaskNetworkId: currentNetworkId,
       }
-      providerResultStub.eth_sendRawTransaction = '0x2a5523c6fa98b47b7d9b6c8320179785150b42a16bcff36b398c5062b65657e8'
+      providerResultStub.eth_sendRawTransaction = hash
     })
+
     it('should publish a tx, updates the rawTx when provided a one', async function () {
       txController.txStateManager.addTx(txMeta)
-      await txController.publishTransaction(txMeta.id, replaceRawTx)
-      txController.setTxHash(1, '0x2a5523c6fa98b47b7d9b6c8320179785150b42a16bcff36b398c5062b65657e8')
-      assert.equal(txController.txStateManager.getTx(1).rawTx, replaceRawTx)
-      assert.notEqual(txController.txStateManager.getTx(1).rawTx, rawTx)
+      await txController.publishTransaction(txMeta.id)
+      const publishedTx = txController.txStateManager.getTx(1) 
+      assert.equal(publishedTx.hash, hash)
+      assert.equal(publishedTx.status, 'submitted')
     })
   })
 
-- 
cgit v1.2.3


From 31e9dcf47063e1be7337d7d06b4c721e0f619951 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 26 Sep 2017 10:02:49 -0700
Subject: Modify tests for new API.

---
 test/unit/currency-controller-test.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/currency-controller-test.js b/test/unit/currency-controller-test.js
index 5eeaf9bcc..63ab60f9e 100644
--- a/test/unit/currency-controller-test.js
+++ b/test/unit/currency-controller-test.js
@@ -15,11 +15,11 @@ describe('currency-controller', function () {
   describe('currency conversions', function () {
     describe('#setCurrentCurrency', function () {
       it('should return USD as default', function () {
-        assert.equal(currencyController.getCurrentCurrency(), 'USD')
+        assert.equal(currencyController.getCurrentCurrency(), 'usd')
       })
 
       it('should be able to set to other currency', function () {
-        assert.equal(currencyController.getCurrentCurrency(), 'USD')
+        assert.equal(currencyController.getCurrentCurrency(), 'usd')
         currencyController.setCurrentCurrency('JPY')
         var result = currencyController.getCurrentCurrency()
         assert.equal(result, 'JPY')
@@ -36,12 +36,12 @@ describe('currency-controller', function () {
     describe('#updateConversionRate', function () {
       it('should retrieve an update for ETH to USD and set it in memory', function (done) {
         this.timeout(15000)
-        nock('https://api.cryptonator.com')
-          .get('/api/ticker/eth-USD')
-          .reply(200, '{"ticker":{"base":"ETH","target":"USD","price":"11.02456145","volume":"44948.91745289","change":"-0.01472534"},"timestamp":1472072136,"success":true,"error":""}')
+        nock('https://api.infura.io')
+          .get('/v1/ticker/ethusd')
+          .reply(200, '{"base": "ETH", "quote": "USD", "bid": 288.45, "ask": 288.46, "volume": 112888.17569277, "exchange": "bitfinex", "total_volume": 272175.00106721005, "num_exchanges": 8, "timestamp": 1506444677}')
 
         assert.equal(currencyController.getConversionRate(), 0)
-        currencyController.setCurrentCurrency('USD')
+        currencyController.setCurrentCurrency('usd')
         currencyController.updateConversionRate()
         .then(function () {
           var result = currencyController.getConversionRate()
@@ -57,14 +57,14 @@ describe('currency-controller', function () {
         this.timeout(15000)
         assert.equal(currencyController.getConversionRate(), 0)
 
-        nock('https://api.cryptonator.com')
-          .get('/api/ticker/eth-JPY')
-          .reply(200, '{"ticker":{"base":"ETH","target":"JPY","price":"11.02456145","volume":"44948.91745289","change":"-0.01472534"},"timestamp":1472072136,"success":true,"error":""}')
+        nock('https://api.infura.io')
+          .get('/v1/ticker/ethjpy')
+          .reply(200, '{"base": "ETH", "quote": "JPY", "bid": 32300.0, "ask": 32400.0, "volume": 247.4616071, "exchange": "kraken", "total_volume": 247.4616071, "num_exchanges": 1, "timestamp": 1506444676}')
 
 
         var promise = new Promise(
           function (resolve, reject) {
-            currencyController.setCurrentCurrency('JPY')
+            currencyController.setCurrentCurrency('jpy')
             currencyController.updateConversionRate().then(function () {
               resolve()
             })
-- 
cgit v1.2.3


From b654eb9b1f37cd3757e4614bb048884ab89d2986 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 11:52:57 -0700
Subject: wrap block tracker in events proxy

---
 test/unit/network-contoller-test.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/unit')

diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js
index 87c2ee7a3..853e4e457 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/network-contoller-test.js
@@ -71,6 +71,7 @@ function dummyProviderConstructor() {
     // provider
     sendAsync: noop,
     // block tracker
+    _blockTracker: {},
     start: noop,
     stop: noop,
     on: noop,
-- 
cgit v1.2.3


From 4f887c6a62ebcecfb578d55fffd3c9f7a1bd088a Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 13:44:45 -0700
Subject: fix test

---
 test/unit/network-contoller-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js
index 853e4e457..c1fdaf032 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/network-contoller-test.js
@@ -21,7 +21,7 @@ describe('# Network Controller', function () {
       it('provider should be updatable without reassignment', function () {
         networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
         const provider = networkController.provider
-        networkController._provider = {test: true}
+        networkController.provider.setTarget({test: true, on: () => {}})
         assert.ok(provider.test)
       })
     })
-- 
cgit v1.2.3


From 9fd545811226c16e11e4f2dc100a348e07f094bf Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 16:52:08 -0700
Subject: transactions: lint fixes and reveal status-update event for balance
 controller

---
 test/unit/tx-controller-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 8d45fb9b5..c1612a30c 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -210,7 +210,7 @@ describe('Transaction Controller', function () {
         txParams: {}
       }
 
-      const eventNames = ['updateBadge', '1:unapproved']
+      const eventNames = ['update:badge', '1:unapproved']
       const listeners = []
       eventNames.forEach((eventName) => {
         listeners.push(new Promise((resolve) => {
-- 
cgit v1.2.3


From 80c98b16531db4c6a13a52df800967af2bc4a676 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 16:55:11 -0700
Subject: transactions: make evnt names pretty and eaiser to read

---
 test/unit/pending-tx-test.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-tx-test.js b/test/unit/pending-tx-test.js
index 8c6d287f8..2865a30e6 100644
--- a/test/unit/pending-tx-test.js
+++ b/test/unit/pending-tx-test.js
@@ -62,7 +62,7 @@ describe('PendingTransactionTracker', function () {
     it('should emit \'txFailed\' if the txMeta does not have a hash', function (done) {
       const block = Proxy.revocable({}, {}).revoke()
       pendingTxTracker.getPendingTransactions = () => [txMetaNoHash]
-      pendingTxTracker.once('txFailed', (txId, err) => {
+      pendingTxTracker.once('tx:failed', (txId, err) => {
         assert(txId, txMetaNoHash.id, 'should pass txId')
         done()
       })
@@ -71,11 +71,11 @@ describe('PendingTransactionTracker', function () {
     it('should emit \'txConfirmed\' if the tx is in the block', function (done) {
       const block = { transactions: [txMeta]}
       pendingTxTracker.getPendingTransactions = () => [txMeta]
-      pendingTxTracker.once('txConfirmed', (txId) => {
+      pendingTxTracker.once('tx:confirmed', (txId) => {
         assert(txId, txMeta.id, 'should pass txId')
         done()
       })
-      pendingTxTracker.once('txFailed', (_, err) => { done(err) })
+      pendingTxTracker.once('tx:failed', (_, err) => { done(err) })
       pendingTxTracker.checkForTxInBlock(block)
     })
   })
@@ -108,7 +108,7 @@ describe('PendingTransactionTracker', function () {
 
   describe('#_checkPendingTx', function () {
     it('should emit \'txFailed\' if the txMeta does not have a hash', function (done) {
-      pendingTxTracker.once('txFailed', (txId, err) => {
+      pendingTxTracker.once('tx:failed', (txId, err) => {
         assert(txId, txMetaNoHash.id, 'should pass txId')
         done()
       })
@@ -122,11 +122,11 @@ describe('PendingTransactionTracker', function () {
 
     it('should emit \'txConfirmed\'', function (done) {
       providerResultStub.eth_getTransactionByHash = {blockNumber: '0x01'}
-      pendingTxTracker.once('txConfirmed', (txId) => {
+      pendingTxTracker.once('tx:confirmed', (txId) => {
         assert(txId, txMeta.id, 'should pass txId')
         done()
       })
-      pendingTxTracker.once('txFailed', (_, err) => { done(err) })
+      pendingTxTracker.once('tx:failed', (_, err) => { done(err) })
       pendingTxTracker._checkPendingTx(txMeta)
     })
   })
@@ -188,7 +188,7 @@ describe('PendingTransactionTracker', function () {
       ]
       const enoughForAllErrors = txList.concat(txList)
 
-      pendingTxTracker.on('txFailed', (_, err) => done(err))
+      pendingTxTracker.on('tx:failed', (_, err) => done(err))
 
       pendingTxTracker.getPendingTransactions = () => enoughForAllErrors
       pendingTxTracker._resubmitTx = async (tx) => {
@@ -202,7 +202,7 @@ describe('PendingTransactionTracker', function () {
       pendingTxTracker.resubmitPendingTxs()
     })
     it('should emit \'txFailed\' if it encountered a real error', function (done) {
-      pendingTxTracker.once('txFailed', (id, err) => err.message === 'im some real error' ? txList[id - 1].resolve() : done(err))
+      pendingTxTracker.once('tx:failed', (id, err) => err.message === 'im some real error' ? txList[id - 1].resolve() : done(err))
 
       pendingTxTracker.getPendingTransactions = () => txList
       pendingTxTracker._resubmitTx = async (tx) => { throw new TypeError('im some real error') }
@@ -226,7 +226,7 @@ describe('PendingTransactionTracker', function () {
 
     // Stubbing out current account state:
     // Adding the fake tx:
-    pendingTxTracker.once('txFailed', (txId, err) => {
+    pendingTxTracker.once('tx:failed', (txId, err) => {
       assert(err, 'Should have a error')
       done()
     })
-- 
cgit v1.2.3


From b05a6f89cb2c4de1e53d96f8cac01653a8165555 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 18:19:44 -0700
Subject: fix tests

---
 test/unit/tx-controller-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index dd8b48684..9ffba31ee 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -25,7 +25,7 @@ describe('Transaction Controller', function () {
       networkStore: new ObservableStore(currentNetworkId),
       txHistoryLimit: 10,
       blockTracker: { getCurrentBlock: noop, on: noop, once: noop },
-      accountTracker: { getState: noop },
+      accountTracker: { store: {getState: noop} },
       signTransaction: (ethTx) => new Promise((resolve) => {
         ethTx.sign(privKey)
         resolve()
@@ -385,7 +385,7 @@ describe('Transaction Controller', function () {
 
   describe('#getBalance', function () {
     it('gets balance', function () {
-      sinon.stub(txController.ethStore, 'getState').callsFake(() => {
+      sinon.stub(txController.accountTracker.store, 'getState').callsFake(() => {
         return {
           accounts: {
             '0x1678a085c290ebd122dc42cba69373b5953b831d': {
-- 
cgit v1.2.3


From 0a94ec41d3a2877ed7cfd3c8f9e9f9d725659183 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 22:42:59 -0700
Subject: pending-tx - move incrementing of the retryCount on the txMeta
 outside pending-tx-tracker

---
 test/unit/tx-controller-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/unit')

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 9ffba31ee..66772ff88 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -25,7 +25,7 @@ describe('Transaction Controller', function () {
       networkStore: new ObservableStore(currentNetworkId),
       txHistoryLimit: 10,
       blockTracker: { getCurrentBlock: noop, on: noop, once: noop },
-      accountTracker: { store: {getState: noop} },
+      accountTracker: { store: { getState: noop } },
       signTransaction: (ethTx) => new Promise((resolve) => {
         ethTx.sign(privKey)
         resolve()
-- 
cgit v1.2.3


From b41aad6d1ae894ab89380b1c7159da8545ad935b Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 27 Sep 2017 12:33:46 -0700
Subject: style - small whitespace nitpick

---
 test/unit/pending-tx-test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/pending-tx-test.js b/test/unit/pending-tx-test.js
index 8c6d287f8..7937afa46 100644
--- a/test/unit/pending-tx-test.js
+++ b/test/unit/pending-tx-test.js
@@ -84,14 +84,14 @@ describe('PendingTransactionTracker', function () {
       let newBlock, oldBlock
       newBlock = { number: '0x01' }
       pendingTxTracker._checkPendingTxs = done
-      pendingTxTracker.queryPendingTxs({oldBlock, newBlock})
+      pendingTxTracker.queryPendingTxs({ oldBlock, newBlock })
     })
     it('should call #_checkPendingTxs if oldBlock and the newBlock have a diff of greater then 1', function (done) {
       let newBlock, oldBlock
       oldBlock = { number: '0x01' }
       newBlock = { number: '0x03' }
       pendingTxTracker._checkPendingTxs = done
-      pendingTxTracker.queryPendingTxs({oldBlock, newBlock})
+      pendingTxTracker.queryPendingTxs({ oldBlock, newBlock })
     })
     it('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less', function (done) {
       let newBlock, oldBlock
@@ -101,7 +101,7 @@ describe('PendingTransactionTracker', function () {
         const err = new Error('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less')
         done(err)
       }
-      pendingTxTracker.queryPendingTxs({oldBlock, newBlock})
+      pendingTxTracker.queryPendingTxs({ oldBlock, newBlock })
       done()
     })
   })
-- 
cgit v1.2.3


From f2d9b75e94ba52ce34faff0640f494028d037246 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 27 Sep 2017 14:44:13 -0700
Subject: network controller - refactor to use _setProvider

---
 test/unit/network-contoller-test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js
index c1fdaf032..0b3b5adeb 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/network-contoller-test.js
@@ -20,9 +20,9 @@ describe('# Network Controller', function () {
     describe('#provider', function () {
       it('provider should be updatable without reassignment', function () {
         networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
-        const provider = networkController.provider
-        networkController.provider.setTarget({test: true, on: () => {}})
-        assert.ok(provider.test)
+        const proxy = networkController._proxy
+        proxy.setTarget({ test: true, on: () => {} })
+        assert.ok(proxy.test)
       })
     })
     describe('#getNetworkState', function () {
-- 
cgit v1.2.3