From a32d71e8ed4c91c8ad73f4a7afc52e506ccf5247 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 6 Oct 2017 12:29:27 -0700
Subject: Add failing test for issue #2294

---
 test/unit/pending-tx-test.js | 53 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

(limited to 'test/unit/pending-tx-test.js')

diff --git a/test/unit/pending-tx-test.js b/test/unit/pending-tx-test.js
index 6b62bb5b1..554bd5591 100644
--- a/test/unit/pending-tx-test.js
+++ b/test/unit/pending-tx-test.js
@@ -5,6 +5,8 @@ const ObservableStore = require('obs-store')
 const clone = require('clone')
 const { createStubedProvider } = require('../stub/provider')
 const PendingTransactionTracker = require('../../app/scripts/lib/pending-tx-tracker')
+const MockTxGen = require('../lib/mock-tx-gen')
+const sinon = require('sinon')
 const noop = () => true
 const currentNetworkId = 42
 const otherNetworkId = 36
@@ -50,6 +52,55 @@ describe('PendingTransactionTracker', function () {
     })
   })
 
+  describe('_checkPendingTx state management', function () {
+    let stub
+
+    afterEach(function () {
+      if (stub) {
+        stub.restore()
+      }
+    })
+
+    it('should become failed if another tx with the same nonce succeeds', async function () {
+
+      // SETUP
+      const txGen = new MockTxGen()
+
+      txGen.generate({
+        id: '456',
+        value: '0x01',
+        hash: '0xbad',
+        status: 'confirmed',
+        nonce: '0x01',
+      }, { count: 1 })
+
+      const pending = txGen.generate({
+        id: '123',
+        value: '0x02',
+        hash: '0xfad',
+        status: 'submitted',
+        nonce: '0x01',
+      }, { count: 1 })[0]
+
+      stub = sinon.stub(pendingTxTracker, 'getPendingTransactions')
+      .returns(txGen.txs)
+
+      // THE EXPECTATION
+      const spy = sinon.spy()
+      pendingTxTracker.on('tx:failed', (txId, err) => {
+        assert.equal(txId, pending.id, 'should fail the pending tx')
+        assert.equal(err.name, 'NonceTakenErr', 'should emit a nonce taken error.')
+        spy(txId, err)
+      })
+
+      // THE METHOD
+      await pendingTxTracker._checkPendingTx(pending)
+
+      // THE ASSERTION
+      return sinon.assert.calledWith(spy, pending.id, 'tx failed should be emitted')
+    })
+  })
+
   describe('#checkForTxInBlock', function () {
     it('should return if no pending transactions', function () {
       // throw a type error if it trys to do anything on the block
@@ -239,4 +290,4 @@ describe('PendingTransactionTracker', function () {
     })
   })
  })
-})
\ No newline at end of file
+})
-- 
cgit 


From 94513cae7bf3c8310ae6a248e12a9b7dd73e306f Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 6 Oct 2017 12:50:33 -0700
Subject: Provide method for tx tracker to refer to all txs

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

(limited to 'test/unit/pending-tx-test.js')

diff --git a/test/unit/pending-tx-test.js b/test/unit/pending-tx-test.js
index 554bd5591..32421a44f 100644
--- a/test/unit/pending-tx-test.js
+++ b/test/unit/pending-tx-test.js
@@ -48,6 +48,7 @@ describe('PendingTransactionTracker', function () {
         }
       },
       getPendingTransactions: () => {return []},
+      getCompletedTransactions: () => {return []},
       publishTransaction: () => {},
     })
   })
@@ -82,7 +83,7 @@ describe('PendingTransactionTracker', function () {
         nonce: '0x01',
       }, { count: 1 })[0]
 
-      stub = sinon.stub(pendingTxTracker, 'getPendingTransactions')
+      stub = sinon.stub(pendingTxTracker, 'getCompletedTransactions')
       .returns(txGen.txs)
 
       // THE EXPECTATION
@@ -97,7 +98,7 @@ describe('PendingTransactionTracker', function () {
       await pendingTxTracker._checkPendingTx(pending)
 
       // THE ASSERTION
-      return sinon.assert.calledWith(spy, pending.id, 'tx failed should be emitted')
+      assert.ok(spy.calledWith(pending.id), 'tx failed should be emitted')
     })
   })
 
-- 
cgit