1 files changed, 44 insertions, 39 deletions
diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 6bd010e7a..ddd921652 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -5,17 +5,16 @@ const EthjsQuery = require('ethjs-query')
 const ObservableStore = require('obs-store')
 const sinon = require('sinon')
 const TransactionController = require('../../app/scripts/controllers/transactions')
-const TxGasUtils = require('../../app/scripts/lib/tx-gas-utils')
-const { createTestProviderTools } = require('../stub/provider')
+const TxGasUtils = require('../../app/scripts/controllers/transactions/tx-gas-utils')
+const { createTestProviderTools, getTestAccounts } = require('../stub/provider')
 
 const noop = () => true
 const currentNetworkId = 42
 const otherNetworkId = 36
-const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex')
 
 
 describe('Transaction Controller', function () {
-  let txController, provider, providerResultStub, testBlockchain
+  let txController, provider, providerResultStub, query, fromAccount
 
   beforeEach(function () {
     providerResultStub = {
@@ -24,9 +23,9 @@ describe('Transaction Controller', function () {
       // by default, all accounts are external accounts (not contracts)
       eth_getCode: '0x',
     }
-    const providerTools = createTestProviderTools({ scaffold: providerResultStub })
-    provider = providerTools.provider
-    testBlockchain = providerTools.testBlockchain
+    provider = createTestProviderTools({ scaffold: providerResultStub }).provider
+    query = new EthjsQuery(provider)
+    fromAccount = getTestAccounts()[0]
 
     txController = new TransactionController({
       provider,
@@ -34,13 +33,43 @@ describe('Transaction Controller', function () {
       txHistoryLimit: 10,
       blockTracker: { getCurrentBlock: noop, on: noop, once: noop },
       signTransaction: (ethTx) => new Promise((resolve) => {
-        ethTx.sign(privKey)
+        ethTx.sign(fromAccount.key)
         resolve()
       }),
     })
     txController.nonceTracker.getNonceLock = () => Promise.resolve({ nextNonce: 0, releaseLock: noop })
   })
 
+  describe('#isNonceTaken', function () {
+    it('should return true', function (done) {
+      txController.txStateManager._saveTxList([
+        { id: 1, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {nonce: 0, from: '0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'} },
+        { id: 2, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {nonce: 0, from: '0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'} },
+        { id: 3, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {nonce: 0, from: '0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'} },
+      ])
+      txController.isNonceTaken({txParams: {nonce:0, from:'0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'}})
+      .then((isNonceTaken) => {
+        assert(isNonceTaken)
+        done()
+      }).catch(done)
+
+    })
+    it('should return false', function (done) {
+      txController.txStateManager._saveTxList([
+        { id: 1, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {nonce: 0, from: '0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'} },
+        { id: 2, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {nonce: 0, from: '0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'} },
+        { id: 3, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {nonce: 0, from: '0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'} },
+      ])
+
+      txController.isNonceTaken({txParams: {nonce:0, from:'0x8ACCE2391C0d510a6C5E5D8f819A678F79B7E675'}})
+      .then((isNonceTaken) => {
+        assert(!isNonceTaken)
+        done()
+      }).catch(done)
+
+    })
+  })
+
   describe('#getState', function () {
     it('should return a state object with the right keys and datat types', function () {
       const exposedState = txController.getState()
@@ -188,7 +217,7 @@ describe('Transaction Controller', function () {
 
   })
 
-  describe('#addTxDefaults', function () {
+  describe('#addTxGasDefaults', function () {
     it('should add the tx defaults if their are none', function (done) {
       const txMeta = {
         'txParams': {
@@ -199,7 +228,7 @@ describe('Transaction Controller', function () {
         providerResultStub.eth_gasPrice = '4a817c800'
         providerResultStub.eth_getBlockByNumber = { gasLimit: '47b784' }
         providerResultStub.eth_estimateGas = '5209'
-      txController.addTxDefaults(txMeta)
+      txController.addTxGasDefaults(txMeta)
       .then((txMetaWithDefaults) => {
         assert(txMetaWithDefaults.txParams.value, '0x0', 'should have added 0x0 as the value')
         assert(txMetaWithDefaults.txParams.gasPrice, 'should have added the gas price')
@@ -210,31 +239,6 @@ describe('Transaction Controller', function () {
     })
   })
 
-  describe('#validateTxParams', function () {
-    it('does not throw for positive values', function (done) {
-      var sample = {
-        from: '0x1678a085c290ebd122dc42cba69373b5953b831d',
-        value: '0x01',
-      }
-      txController.txGasUtil.validateTxParams(sample).then(() => {
-        done()
-      }).catch(done)
-    })
-
-    it('returns error for negative values', function (done) {
-      var sample = {
-        from: '0x1678a085c290ebd122dc42cba69373b5953b831d',
-        value: '-0x01',
-      }
-      txController.txGasUtil.validateTxParams(sample)
-      .then(() => done('expected to thrown on negativity values but didn\'t'))
-      .catch((err) => {
-        assert.ok(err, 'error')
-        done()
-      })
-    })
-  })
-
   describe('#addTx', function () {
     it('should emit updates', function (done) {
       const txMeta = {
@@ -323,12 +327,12 @@ describe('Transaction Controller', function () {
 
   describe('#updateAndApproveTransaction', function () {
     let txMeta
-    beforeEach(function () {
+    beforeEach(() => {
       txMeta = {
         id: 1,
         status: 'unapproved',
         txParams: {
-          from: '0xc684832530fcbddae4b4230a47e991ddcec2831d',
+          from: fromAccount.address,
           to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
           gasPrice: '0x77359400',
           gas: '0x7b0d',
@@ -337,11 +341,12 @@ describe('Transaction Controller', function () {
         metamaskNetworkId: currentNetworkId,
       }
     })
-    it('should update and approve transactions', function () {
+    it('should update and approve transactions', async () => {
       txController.txStateManager.addTx(txMeta)
-      txController.updateAndApproveTransaction(txMeta)
+      const approvalPromise = txController.updateAndApproveTransaction(txMeta)
       const tx = txController.txStateManager.getTx(1)
       assert.equal(tx.status, 'approved')
+      await approvalPromise
     })
   })