Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

1 files changed, 6 insertions, 8 deletions

diff --git a/test/unit/app/controllers/transactions/nonce-tracker-test.js b/test/unit/app/controllers/transactions/nonce-tracker-test.js
index fc852458c..6c0ac759f 100644
--- a/test/unit/app/controllers/transactions/nonce-tracker-test.js
+++ b/test/unit/app/controllers/transactions/nonce-tracker-test.js
@@ -1,12 +1,10 @@
 const assert = require('assert')
 const NonceTracker = require('../../../../../app/scripts/controllers/transactions/nonce-tracker')
 const MockTxGen = require('../../../../lib/mock-tx-gen')
-let providerResultStub = {}
+const providerResultStub = {}
 
 describe('Nonce Tracker', function () {
-  let nonceTracker, provider
-  let getPendingTransactions, pendingTxs
-  let getConfirmedTransactions, confirmedTxs
+  let nonceTracker, pendingTxs, confirmedTxs
 
   describe('#getNonceLock', function () {
 
@@ -182,8 +180,8 @@ describe('Nonce Tracker', function () {
     describe('When all three return different values', function () {
       beforeEach(function () {
         const txGen = new MockTxGen()
-        const confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 10 })
-        const pendingTxs = txGen.generate({
+        confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 10 })
+        pendingTxs = txGen.generate({
           status: 'submitted',
           nonce: 100,
         }, { count: 1 })
@@ -202,8 +200,8 @@ describe('Nonce Tracker', function () {
     describe('Faq issue 67', function () {
       beforeEach(function () {
         const txGen = new MockTxGen()
-        const confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 64 })
-        const pendingTxs = txGen.generate({
+        confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 64 })
+        pendingTxs = txGen.generate({
           status: 'submitted',
         }, { count: 10 })
                                          // 0x40 is 64 in hex: