Merge remote-tracking branch 'upstream/develop' into HEAD

18 files changed, 313 insertions, 231 deletions

diff --git a/test/unit/app/account-import-strategies.spec.js b/test/unit/app/account-import-strategies.spec.js
index 83cfaeb3e..d20ba0f0b 100644
--- a/test/unit/app/account-import-strategies.spec.js
+++ b/test/unit/app/account-import-strategies.spec.js
@@ -1,31 +1,58 @@
 const assert = require('assert')
-const path = require('path')
-const accountImporter = require('../../../app/scripts/account-import-strategies/index')
 const ethUtil = require('ethereumjs-util')
+const accountImporter = require('../../../app/scripts/account-import-strategies/index')
+const { assertRejects } = require('../test-utils')
 
 describe('Account Import Strategies', function () {
   const privkey = '0x4cfd3e90fc78b0f86bf7524722150bb8da9c60cd532564d7ff43f5716514f553'
   const json = '{"version":3,"id":"dbb54385-0a99-437f-83c0-647de9f244c3","address":"a7f92ce3fba24196cf6f4bd2e1eb3db282ba998c","Crypto":{"ciphertext":"bde13d9ade5c82df80281ca363320ce254a8a3a06535bbf6ffdeaf0726b1312c","cipherparams":{"iv":"fbf93718a57f26051b292f072f2e5b41"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"7ffe00488319dec48e4c49a120ca49c6afbde9272854c64d9541c83fc6acdffe","n":8192,"r":8,"p":1},"mac":"2adfd9c4bc1cdac4c85bddfb31d9e21a684e0e050247a70c5698facf6b7d4681"}}'
 
-  it('imports a private key and strips 0x prefix', async function () {
-    const importPrivKey = await accountImporter.importAccount('Private Key', [ privkey ])
-    assert.equal(importPrivKey, ethUtil.stripHexPrefix(privkey))
-  })
+  describe('private key import', function () {
+    it('imports a private key and strips 0x prefix', async function () {
+      const importPrivKey = await accountImporter.importAccount('Private Key', [ privkey ])
+      assert.equal(importPrivKey, ethUtil.stripHexPrefix(privkey))
+    })
 
-  it('fails when password is incorrect for keystore', async function () {
-    const wrongPassword = 'password2'
+    it('throws an error for empty string private key', async () => {
+      assertRejects(async function () {
+        await accountImporter.importAccount('Private Key', [ '' ])
+      }, Error, 'no empty strings')
+    })
 
-    try {
-      await accountImporter.importAccount('JSON File', [ json, wrongPassword])
-    } catch (error) {
-      assert.equal(error.message, 'Key derivation failed - possibly wrong passphrase')
-    }
-  })
+    it('throws an error for undefined string private key', async () => {
+      assertRejects(async function () {
+        await accountImporter.importAccount('Private Key', [ undefined ])
+      })
+    })
 
-  it('imports json string and password to return a private key', async function () {
-    const fileContentsPassword = 'password1'
-    const importJson = await accountImporter.importAccount('JSON File', [ json, fileContentsPassword])
-    assert.equal(importJson, '0x5733876abe94146069ce8bcbabbde2677f2e35fa33e875e92041ed2ac87e5bc7')
+    it('throws an error for undefined string private key', async () => {
+      assertRejects(async function () {
+        await accountImporter.importAccount('Private Key', [])
+      })
+    })
+
+    it('throws an error for invalid private key', async () => {
+      assertRejects(async function () {
+        await accountImporter.importAccount('Private Key', [ 'popcorn' ])
+      })
+    })
   })
 
+  describe('JSON keystore import', function () {
+    it('fails when password is incorrect for keystore', async function () {
+      const wrongPassword = 'password2'
+
+      try {
+        await accountImporter.importAccount('JSON File', [ json, wrongPassword])
+      } catch (error) {
+        assert.equal(error.message, 'Key derivation failed - possibly wrong passphrase')
+      }
+    })
+
+    it('imports json string and password to return a private key', async function () {
+      const fileContentsPassword = 'password1'
+      const importJson = await accountImporter.importAccount('JSON File', [ json, fileContentsPassword])
+      assert.equal(importJson, '0x5733876abe94146069ce8bcbabbde2677f2e35fa33e875e92041ed2ac87e5bc7')
+    })
+  })
 })
diff --git a/test/unit/app/controllers/address-book-controller.js b/test/unit/app/controllers/address-book-controller.js
index dc4b8e3ff..1350e1a61 100644
--- a/test/unit/app/controllers/address-book-controller.js
+++ b/test/unit/app/controllers/address-book-controller.js
@@ -12,7 +12,7 @@ const stubPreferencesStore = {
       },
     }
   },
-};
+}
 
 describe('address-book-controller', function () {
   var addressBookController
diff --git a/test/unit/app/controllers/metamask-controller-test.js b/test/unit/app/controllers/metamask-controller-test.js
index 4bc16e65e..0dda4609b 100644
--- a/test/unit/app/controllers/metamask-controller-test.js
+++ b/test/unit/app/controllers/metamask-controller-test.js
@@ -45,7 +45,7 @@ describe('MetaMaskController', function () {
       encryptor: {
         encrypt: function (password, object) {
           this.object = object
-          return Promise.resolve()
+          return Promise.resolve('mock-encrypted')
         },
         decrypt: function () {
           return Promise.resolve(this.object)
@@ -53,6 +53,9 @@ describe('MetaMaskController', function () {
       },
       initState: clone(firstTimeState),
     })
+    // disable diagnostics
+    metamaskController.diagnostics = null
+    // add sinon method spies
     sandbox.spy(metamaskController.keyringController, 'createNewVaultAndKeychain')
     sandbox.spy(metamaskController.keyringController, 'createNewVaultAndRestore')
   })
@@ -62,6 +65,31 @@ describe('MetaMaskController', function () {
     sandbox.restore()
   })
 
+  describe('submitPassword', function () {
+    const password = 'password'
+
+    beforeEach(async function () {
+      await metamaskController.createNewVaultAndKeychain(password)
+    })
+
+    it('removes any identities that do not correspond to known accounts.', async function () {
+      const fakeAddress = '0xbad0'
+      metamaskController.preferencesController.addAddresses([fakeAddress])
+      await metamaskController.submitPassword(password)
+
+      const identities = Object.keys(metamaskController.preferencesController.store.getState().identities)
+      const addresses = await metamaskController.keyringController.getAccounts()
+
+      identities.forEach((identity) => {
+        assert.ok(addresses.includes(identity), `addresses should include all IDs: ${identity}`)
+      })
+
+      addresses.forEach((address) => {
+        assert.ok(identities.includes(address), `identities should include all Addresses: ${address}`)
+      })
+    })
+  })
+
   describe('#getGasPrice', function () {
 
     it('gives the 50th percentile lowest accepted gas price from recentBlocksController', async function () {
@@ -479,7 +507,7 @@ describe('MetaMaskController', function () {
     it('errors when signing a message', async function () {
       await metamaskController.signPersonalMessage(personalMessages[0].msgParams)
       assert.equal(metamaskPersonalMsgs[msgId].status, 'signed')
-      assert.equal(metamaskPersonalMsgs[msgId].rawSig, '0x6a1b65e2b8ed53cf398a769fad24738f9fbe29841fe6854e226953542c4b6a173473cb152b6b1ae5f06d601d45dd699a129b0a8ca84e78b423031db5baa734741b')      
+      assert.equal(metamaskPersonalMsgs[msgId].rawSig, '0x6a1b65e2b8ed53cf398a769fad24738f9fbe29841fe6854e226953542c4b6a173473cb152b6b1ae5f06d601d45dd699a129b0a8ca84e78b423031db5baa734741b')
     })
   })
 
@@ -513,7 +541,7 @@ describe('MetaMaskController', function () {
     })
 
     it('sets up controller dnode api for trusted communication', function (done) {
-      streamTest = createThoughStream((chunk, enc, cb) => { 
+      streamTest = createThoughStream((chunk, enc, cb) => {
         assert.equal(chunk.name, 'controller')
         cb()
         done()
diff --git a/test/unit/app/controllers/network-contoller-test.js b/test/unit/app/controllers/network-contoller-test.js
index 789850ef3..e16fb104e 100644
--- a/test/unit/app/controllers/network-contoller-test.js
+++ b/test/unit/app/controllers/network-contoller-test.js
@@ -5,9 +5,6 @@ const {
   getNetworkDisplayName,
 } = require('../../../../app/scripts/controllers/network/util')
 
-const { createTestProviderTools } = require('../../../stub/provider')
-const providerResultStub = {}
-
 describe('# Network Controller', function () {
   let networkController
   const noop = () => {}
diff --git a/test/unit/app/controllers/notice-controller-test.js b/test/unit/app/controllers/notice-controller-test.js
index e78b69623..b3ae75080 100644
--- a/test/unit/app/controllers/notice-controller-test.js
+++ b/test/unit/app/controllers/notice-controller-test.js
@@ -14,18 +14,6 @@ describe('notice-controller', function () {
   })
 
   describe('notices', function () {
-    describe('#getNoticesList', function () {
-      it('should return an empty array when new', function (done) {
-        // const testList = [{
-        //   id: 0,
-        //   read: false,
-        //   title: 'Futuristic Notice',
-        // }]
-        var result = noticeController.getNoticesList()
-        assert.equal(result.length, 0)
-        done()
-      })
-    })
 
     describe('#setNoticesList', function () {
       it('should set data appropriately', function (done) {
@@ -41,36 +29,6 @@ describe('notice-controller', function () {
       })
     })
 
-    describe('#updateNoticeslist', function () {
-      it('should integrate the latest changes from the source', function (done) {
-        var testList = [{
-          id: 55,
-          read: false,
-          title: 'Futuristic Notice',
-        }]
-        noticeController.setNoticesList(testList)
-        noticeController.updateNoticesList().then(() => {
-          var newList = noticeController.getNoticesList()
-          assert.ok(newList[0].id === 55)
-          assert.ok(newList[1])
-          done()
-        })
-      })
-      it('should not overwrite any existing fields', function (done) {
-        var testList = [{
-          id: 0,
-          read: false,
-          title: 'Futuristic Notice',
-        }]
-        noticeController.setNoticesList(testList)
-        var newList = noticeController.getNoticesList()
-        assert.equal(newList[0].id, 0)
-        assert.equal(newList[0].title, 'Futuristic Notice')
-        assert.equal(newList.length, 1)
-        done()
-      })
-    })
-
     describe('#markNoticeRead', function () {
       it('should mark a notice as read', function (done) {
         var testList = [{
@@ -86,7 +44,7 @@ describe('notice-controller', function () {
       })
     })
 
-    describe('#getLatestUnreadNotice', function () {
+    describe('#getNextUnreadNotice', function () {
       it('should retrieve the latest unread notice', function (done) {
         var testList = [
           {id: 0, read: true, title: 'Past Notice'},
@@ -94,8 +52,8 @@ describe('notice-controller', function () {
           {id: 2, read: false, title: 'Future Notice'},
         ]
         noticeController.setNoticesList(testList)
-        var latestUnread = noticeController.getLatestUnreadNotice()
-        assert.equal(latestUnread.id, 2)
+        var latestUnread = noticeController.getNextUnreadNotice()
+        assert.equal(latestUnread.id, 1)
         done()
       })
       it('should return undefined if no unread notices exist.', function (done) {
@@ -105,7 +63,7 @@ describe('notice-controller', function () {
           {id: 2, read: true, title: 'Future Notice'},
         ]
         noticeController.setNoticesList(testList)
-        var latestUnread = noticeController.getLatestUnreadNotice()
+        var latestUnread = noticeController.getNextUnreadNotice()
         assert.ok(!latestUnread)
         done()
       })
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:
diff --git a/test/unit/app/controllers/transactions/pending-tx-test.js b/test/unit/app/controllers/transactions/pending-tx-test.js
index e7705c594..8bf2da6f8 100644
--- a/test/unit/app/controllers/transactions/pending-tx-test.js
+++ b/test/unit/app/controllers/transactions/pending-tx-test.js
@@ -1,20 +1,12 @@
 const assert = require('assert')
-const ethUtil = require('ethereumjs-util')
-const EthTx = require('ethereumjs-tx')
-const ObservableStore = require('obs-store')
-const clone = require('clone')
 const { createTestProviderTools } = require('../../../../stub/provider')
 const PendingTransactionTracker = require('../../../../../app/scripts/controllers/transactions/pending-tx-tracker')
 const MockTxGen = require('../../../../lib/mock-tx-gen')
 const sinon = require('sinon')
-const noop = () => true
-const currentNetworkId = 42
-const otherNetworkId = 36
-const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex')
 
 
 describe('PendingTransactionTracker', function () {
-  let pendingTxTracker, txMeta, txMetaNoHash, txMetaNoRawTx, providerResultStub,
+  let pendingTxTracker, txMeta, txMetaNoHash, providerResultStub,
   provider, txMeta3, txList, knownErrors
   this.timeout(10000)
   beforeEach(function () {
@@ -34,11 +26,7 @@ describe('PendingTransactionTracker', function () {
       status: 'signed',
       txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d'},
     }
-    txMetaNoRawTx = {
-      hash: '0x0593ee121b92e10d63150ad08b4b8f9c7857d1bd160195ee648fb9a0f8d00eeb',
-      status: 'signed',
-      txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d'},
-    }
+
     providerResultStub = {}
     provider = createTestProviderTools({ scaffold: providerResultStub }).provider
 
@@ -47,10 +35,10 @@ describe('PendingTransactionTracker', function () {
       nonceTracker: {
         getGlobalLock: async () => {
           return { releaseLock: () => {} }
-        }
+        },
       },
-      getPendingTransactions: () => {return []},
-      getCompletedTransactions: () => {return []},
+      getPendingTransactions: () => { return [] },
+      getCompletedTransactions: () => { return [] },
       publishTransaction: () => {},
     })
   })
@@ -133,22 +121,20 @@ describe('PendingTransactionTracker', function () {
   })
   describe('#queryPendingTxs', function () {
     it('should call #_checkPendingTxs if their is no oldBlock', function (done) {
-      let newBlock, oldBlock
-      newBlock = { number: '0x01' }
+      let oldBlock
+      const newBlock = { number: '0x01' }
       pendingTxTracker._checkPendingTxs = done
       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' }
+      const oldBlock = { number: '0x01' }
+      const newBlock = { number: '0x03' }
       pendingTxTracker._checkPendingTxs = done
       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
-      oldBlock = { number: '0x1' }
-      newBlock = { number: '0x2' }
+      const oldBlock = { number: '0x1' }
+      const newBlock = { number: '0x2' }
       pendingTxTracker._checkPendingTxs = () => {
         const err = new Error('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less')
         done(err)
@@ -189,7 +175,7 @@ describe('PendingTransactionTracker', function () {
       txMeta2.id = 2
       txMeta3.id = 3
       txList = [txMeta, txMeta2, txMeta3].map((tx) => {
-        tx.processed = new Promise ((resolve) => { tx.resolve = resolve })
+        tx.processed = new Promise((resolve) => { tx.resolve = resolve })
         return tx
       })
     })
@@ -197,7 +183,6 @@ describe('PendingTransactionTracker', function () {
     it('should warp all txMeta\'s in #_checkPendingTx', function (done) {
       pendingTxTracker.getPendingTransactions = () => txList
       pendingTxTracker._checkPendingTx = (tx) => { tx.resolve(tx) }
-      const list = txList.map
       Promise.all(txList.map((tx) => tx.processed))
       .then((txCompletedList) => done())
       .catch(done)
@@ -207,11 +192,11 @@ describe('PendingTransactionTracker', function () {
   })
 
   describe('#resubmitPendingTxs', function () {
-    const blockStub = { number: '0x0' };
+    const blockStub = { number: '0x0' }
     beforeEach(function () {
     const txMeta2 = txMeta3 = txMeta
     txList = [txMeta, txMeta2, txMeta3].map((tx) => {
-        tx.processed = new Promise ((resolve) => { tx.resolve = resolve })
+        tx.processed = new Promise((resolve) => { tx.resolve = resolve })
         return tx
       })
     })
@@ -228,7 +213,7 @@ describe('PendingTransactionTracker', function () {
       pendingTxTracker.resubmitPendingTxs(blockStub)
     })
     it('should not emit \'tx:failed\' if the txMeta throws a known txError', function (done) {
-      knownErrors =[
+      knownErrors = [
         // geth
         '     Replacement transaction Underpriced            ',
         '       known transaction',
@@ -275,7 +260,7 @@ describe('PendingTransactionTracker', function () {
   })
   describe('#_resubmitTx', function () {
     const mockFirstRetryBlockNumber = '0x1'
-    let txMetaToTestExponentialBackoff
+    let txMetaToTestExponentialBackoff, enoughBalance
 
     beforeEach(() => {
       pendingTxTracker.getBalance = (address) => {
@@ -298,7 +283,7 @@ describe('PendingTransactionTracker', function () {
     })
 
     it('should publish the transaction', function (done) {
-      const enoughBalance = '0x100000'
+      enoughBalance = '0x100000'
 
       // Stubbing out current account state:
       // Adding the fake tx:
@@ -313,7 +298,7 @@ describe('PendingTransactionTracker', function () {
     })
 
     it('should not publish the transaction if the limit of retries has been exceeded', function (done) {
-      const enoughBalance = '0x100000'
+      enoughBalance = '0x100000'
       const mockLatestBlockNumber = '0x5'
 
       pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber)
@@ -327,7 +312,7 @@ describe('PendingTransactionTracker', function () {
     })
 
     it('should publish the transaction if the number of blocks since last retry exceeds the last set limit', function (done) {
-      const enoughBalance = '0x100000'
+      enoughBalance = '0x100000'
       const mockLatestBlockNumber = '0x11'
 
       pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber)
@@ -342,8 +327,8 @@ describe('PendingTransactionTracker', function () {
   })
 
   describe('#_checkIfNonceIsTaken', function () {
-    beforeEach ( function () {
-      let confirmedTxList = [{
+    beforeEach(function () {
+      const confirmedTxList = [{
         id: 1,
         hash: '0x0593ee121b92e10d63150ad08b4b8f9c7857d1bd160195ee648fb9a0f8d00eeb',
         status: 'confirmed',
diff --git a/test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js b/test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js
new file mode 100644
index 000000000..cb413545f
--- /dev/null
+++ b/test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js
@@ -0,0 +1,77 @@
+const assert = require('assert')
+const recipientBlackListChecker = require('../../../../../app/scripts/controllers/transactions/lib/recipient-blacklist-checker')
+const {
+  ROPSTEN_CODE,
+  RINKEYBY_CODE,
+  KOVAN_CODE,
+} = require('../../../../../app/scripts/controllers/network/enums')
+
+const KeyringController = require('eth-keyring-controller')
+
+describe('Recipient Blacklist Checker', function () {
+
+  let publicAccounts
+
+  before(async function () {
+    const damnedMnemonic = 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat'
+    const keyringController = new KeyringController({})
+    const Keyring = keyringController.getKeyringClassForType('HD Key Tree')
+    const opts = {
+      mnemonic: damnedMnemonic,
+      numberOfAccounts: 10,
+    }
+    const keyring = new Keyring(opts)
+    publicAccounts = await keyring.getAccounts()
+  })
+
+  describe('#checkAccount', function () {
+    it('does not fail on test networks', function () {
+      let callCount = 0
+      const networks = [ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE]
+      for (const networkId in networks) {
+        publicAccounts.forEach((account) => {
+           recipientBlackListChecker.checkAccount(networkId, account)
+            callCount++
+        })
+      }
+      assert.equal(callCount, 30)
+    })
+
+    it('fails on mainnet', function () {
+      const mainnetId = 1
+      let callCount = 0
+      publicAccounts.forEach((account) => {
+        try {
+          recipientBlackListChecker.checkAccount(mainnetId, account)
+          assert.fail('function should have thrown an error')
+        } catch (err) {
+          assert.equal(err.message, 'Recipient is a public account')
+        }
+        callCount++
+      })
+      assert.equal(callCount, 10)
+    })
+
+    it('fails for public account - uppercase', function () {
+      const mainnetId = 1
+      const publicAccount = '0X0D1D4E623D10F9FBA5DB95830F7D3839406C6AF2'
+      try {
+        recipientBlackListChecker.checkAccount(mainnetId, publicAccount)
+        assert.fail('function should have thrown an error')
+      } catch (err) {
+        assert.equal(err.message, 'Recipient is a public account')
+      }
+    })
+
+    it('fails for public account - lowercase', async function () {
+      const mainnetId = 1
+      const publicAccount = '0x0d1d4e623d10f9fba5db95830f7d3839406c6af2'
+      try {
+        await recipientBlackListChecker.checkAccount(mainnetId, publicAccount)
+        assert.fail('function should have thrown an error')
+      } catch (err) {
+        assert.equal(err.message, 'Recipient is a public account')
+      }
+    })
+  })
+})
diff --git a/test/unit/app/controllers/transactions/tx-controller-test.js b/test/unit/app/controllers/transactions/tx-controller-test.js
index 1f32a0f37..d4c5ff0ec 100644
--- a/test/unit/app/controllers/transactions/tx-controller-test.js
+++ b/test/unit/app/controllers/transactions/tx-controller-test.js
@@ -1,20 +1,17 @@
 const assert = require('assert')
 const ethUtil = require('ethereumjs-util')
 const EthTx = require('ethereumjs-tx')
-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/controllers/transactions/tx-gas-utils')
 const { createTestProviderTools, getTestAccounts } = require('../../../../stub/provider')
 
 const noop = () => true
 const currentNetworkId = 42
-const otherNetworkId = 36
 
 
 describe('Transaction Controller', function () {
-  let txController, provider, providerResultStub, query, fromAccount
+  let txController, provider, providerResultStub, fromAccount
 
   beforeEach(function () {
     providerResultStub = {
@@ -24,7 +21,6 @@ describe('Transaction Controller', function () {
       eth_getCode: '0x',
     }
     provider = createTestProviderTools({ scaffold: providerResultStub }).provider
-    query = new EthjsQuery(provider)
     fromAccount = getTestAccounts()[0]
 
     txController = new TransactionController({
@@ -185,6 +181,23 @@ describe('Transaction Controller', function () {
       .catch(done)
     })
 
+    it('should fail if recipient is public', function (done) {
+      txController.networkStore = new ObservableStore(1)
+      txController.addUnapprovedTransaction({ from: '0x1678a085c290ebd122dc42cba69373b5953b831d', to: '0x0d1d4e623D10F9FBA5Db95830F7d3839406C6AF2' })
+      .catch((err) => {
+        if (err.message === 'Recipient is a public account') done()
+        else done(err)
+      })
+    })
+
+    it('should not fail if recipient is public but not on mainnet', function (done) {
+      txController.once('newUnapprovedTx', (txMetaFromEmit) => {
+        assert(txMetaFromEmit, 'txMeta is falsey')
+        done()
+      })
+      txController.addUnapprovedTransaction({ from: '0x1678a085c290ebd122dc42cba69373b5953b831d', to: '0x0d1d4e623D10F9FBA5Db95830F7d3839406C6AF2' })
+      .catch(done)
+    })
   })
 
   describe('#addTxGasDefaults', function () {
@@ -371,7 +384,7 @@ describe('Transaction Controller', function () {
 
   describe('#retryTransaction', function () {
     it('should create a new txMeta with the same txParams as the original one', function (done) {
-      let txParams = {
+      const txParams = {
         nonce: '0x00',
         from: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',
         to: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',
diff --git a/test/unit/app/controllers/transactions/tx-gas-util-test.js b/test/unit/app/controllers/transactions/tx-gas-util-test.js
index d1ee86033..31defd6ed 100644
--- a/test/unit/app/controllers/transactions/tx-gas-util-test.js
+++ b/test/unit/app/controllers/transactions/tx-gas-util-test.js
@@ -1,6 +1,5 @@
 const assert = require('assert')
 const Transaction = require('ethereumjs-tx')
-const BN = require('bn.js')
 
 
 const { hexToBn, bnToHex } = require('../../../../../app/scripts/lib/util')
diff --git a/test/unit/app/controllers/transactions/tx-state-history-helper-test.js b/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
index f4c3a6be1..fba0e7fda 100644
--- a/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
@@ -2,16 +2,16 @@ const assert = require('assert')
 const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
 const testVault = require('../../../../data/v17-long-history.json')
 
-describe ('Transaction state history helper', function () {
+describe('Transaction state history helper', function () {
 
   describe('#snapshotFromTxMeta', function () {
     it('should clone deep', function () {
       const input = {
         foo: {
           bar: {
-            bam: 'baz'
-          }
-        }
+            bam: 'baz',
+          },
+        },
       }
       const output = txStateHistoryHelper.snapshotFromTxMeta(input)
       assert('foo' in output, 'has a foo key')
@@ -50,14 +50,14 @@ describe ('Transaction state history helper', function () {
     it('replaying history does not mutate the original obj', function () {
       const initialState = { test: true, message: 'hello', value: 1 }
       const diff1 = [{
-        "op": "replace",
-        "path": "/message",
-        "value": "haay",
+        'op': 'replace',
+        'path': '/message',
+        'value': 'haay',
       }]
       const diff2 = [{
-        "op": "replace",
-        "path": "/value",
-        "value": 2,
+        'op': 'replace',
+        'path': '/value',
+        'value': 2,
       }]
       const history = [initialState, diff1, diff2]
 
@@ -72,15 +72,15 @@ describe ('Transaction state history helper', function () {
 
   describe('#generateHistoryEntry', function () {
 
-    function generateHistoryEntryTest(note) {
+    function generateHistoryEntryTest (note) {
 
       const prevState = {
         someValue: 'value 1',
         foo: {
           bar: {
-            bam: 'baz'
-          }
-        }
+            bam: 'baz',
+          },
+        },
       }
 
       const nextState = {
@@ -89,9 +89,9 @@ describe ('Transaction state history helper', function () {
         foo: {
           newPropFirstLevel: 'new property - first level',
           bar: {
-            bam: 'baz'
-          }
-        }
+            bam: 'baz',
+          },
+        },
       }
 
       const before = new Date().getTime()
@@ -106,8 +106,7 @@ describe ('Transaction state history helper', function () {
       assert.equal(result[0].path, expectedEntry1.path)
       assert.equal(result[0].value, expectedEntry1.value)
       assert.equal(result[0].value, expectedEntry1.value)
-      if (note) 
-        assert.equal(result[0].note, note)
+      if (note) { assert.equal(result[0].note, note) }
 
       assert.ok(result[0].timestamp >= before && result[0].timestamp <= after)
 
@@ -124,6 +123,6 @@ describe ('Transaction state history helper', function () {
 
     it('should add note to first entry', function () {
       generateHistoryEntryTest('custom note')
-    })    
+    })
   })
-})
\ No newline at end of file
+})
diff --git a/test/unit/app/controllers/transactions/tx-state-manager-test.js b/test/unit/app/controllers/transactions/tx-state-manager-test.js
index 20bc08b94..2f91b1545 100644
--- a/test/unit/app/controllers/transactions/tx-state-manager-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-manager-test.js
@@ -1,6 +1,4 @@
 const assert = require('assert')
-const clone = require('clone')
-const ObservableStore = require('obs-store')
 const TxStateManager = require('../../../../../app/scripts/controllers/transactions/tx-state-manager')
 const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
 const noop = () => true
@@ -16,23 +14,23 @@ describe('TransactionStateManager', function () {
         transactions: [],
       },
       txHistoryLimit: 10,
-      getNetwork: () => currentNetworkId
+      getNetwork: () => currentNetworkId,
     })
   })
 
   describe('#setTxStatusSigned', function () {
     it('sets the tx status to signed', function () {
-      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
       txStateManager.setTxStatusSigned(1)
-      let result = txStateManager.getTxList()
+      const 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 tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       const noop = function () {
         assert(true, 'event listener has been triggered and noop executed')
         done()
@@ -46,21 +44,24 @@ describe('TransactionStateManager', function () {
 
   describe('#setTxStatusRejected', function () {
     it('sets the tx status to rejected', function () {
-      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx)
       txStateManager.setTxStatusRejected(1)
-      let result = txStateManager.getTxList()
+      const 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: {} }
+      const 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()
+          if (err) {
+            console.log('Error: ', err)
+          }
+          assert(true, 'event listener has been triggered and noop executed')
+          done()
       }
       txStateManager.on('1:rejected', noop)
       txStateManager.setTxStatusRejected(1)
@@ -69,7 +70,7 @@ describe('TransactionStateManager', function () {
 
   describe('#getFullTxList', function () {
     it('when new should return empty array', function () {
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 0)
     })
@@ -77,7 +78,7 @@ describe('TransactionStateManager', function () {
 
   describe('#getTxList', function () {
     it('when new should return empty array', function () {
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 0)
     })
@@ -85,21 +86,21 @@ describe('TransactionStateManager', function () {
 
   describe('#addTx', function () {
     it('adds a tx returned in getTxList', function () {
-      let tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
-      let result = txStateManager.getTxList()
+      const 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: {} }
+      const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
       txStateManager.addTx(tx2, noop)
-      let result = txStateManager.getFullTxList()
-      let result2 = txStateManager.getTxList()
+      const result = txStateManager.getFullTxList()
+      const result2 = txStateManager.getTxList()
       assert.equal(result.length, 2, 'txs were deleted')
       assert.equal(result2.length, 1, 'incorrect number of txs on network.')
     })
@@ -110,7 +111,7 @@ describe('TransactionStateManager', function () {
         const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
       assert.equal(result[0].id, 1, 'early txs truncted')
     })
@@ -121,20 +122,20 @@ describe('TransactionStateManager', function () {
         const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
-      let result = txStateManager.getTxList()
+      const 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: {} }
+      const 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()
+      const 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')
@@ -149,7 +150,7 @@ describe('TransactionStateManager', function () {
       const txMeta = txStateManager.getTx('1')
       txMeta.hash = 'foo'
       txStateManager.updateTx(txMeta)
-      let result = txStateManager.getTx('1')
+      const result = txStateManager.getTx('1')
       assert.equal(result.hash, 'foo')
     })
 
@@ -166,8 +167,6 @@ describe('TransactionStateManager', function () {
         },
       }
 
-      const updatedMeta = clone(txMeta)
-
       txStateManager.addTx(txMeta)
       const updatedTx = txStateManager.getTx('1')
       // verify tx was initialized correctly
@@ -185,7 +184,7 @@ describe('TransactionStateManager', function () {
       // validate history was updated
       assert.equal(result.history.length, 2, 'two history items (initial + diff)')
       assert.equal(result.history[1].length, 1, 'two history state items (initial + diff)')
-      
+
       const expectedEntry = { op: 'replace', path: '/txParams/gasPrice', value: desiredGasPrice }
       assert.deepEqual(result.history[1][0].op, expectedEntry.op, 'two history items (initial + diff) operation')
       assert.deepEqual(result.history[1][0].path, expectedEntry.path, 'two history items (initial + diff) path')
diff --git a/test/unit/app/controllers/transactions/tx-utils-test.js b/test/unit/app/controllers/transactions/tx-utils-test.js
index 115127f85..029fab4d5 100644
--- a/test/unit/app/controllers/transactions/tx-utils-test.js
+++ b/test/unit/app/controllers/transactions/tx-utils-test.js
@@ -27,7 +27,7 @@ describe('txUtils', function () {
 
   describe('#normalizeTxParams', () => {
     it('should normalize txParams', () => {
-      let txParams = {
+      const txParams = {
         chainId: '0x1',
         from: 'a7df1beDBF813f57096dF77FCd515f0B3900e402',
         to: null,
@@ -91,7 +91,7 @@ describe('txUtils', function () {
       assert.throws(() => { txUtils.validateFrom(txParams) }, Error, `Invalid from address`)
 
       // should run
-      txParams.from ='0x1678a085c290ebd122dc42cba69373b5953b831d'
+      txParams.from = '0x1678a085c290ebd122dc42cba69373b5953b831d'
       txUtils.validateFrom(txParams)
       })
   })
diff --git a/test/unit/app/edge-encryptor-test.js b/test/unit/app/edge-encryptor-test.js
index cc9777389..1a6255b36 100644
--- a/test/unit/app/edge-encryptor-test.js
+++ b/test/unit/app/edge-encryptor-test.js
@@ -11,7 +11,7 @@ global.crypto = global.crypto || {
       array[i] = Math.random() * 100
     }
     return array
-  }
+  },
 }
 
 describe('EdgeEncryptor', function () {
@@ -33,10 +33,10 @@ describe('EdgeEncryptor', function () {
     it('should return proper format.', function (done) {
       edgeEncryptor.encrypt(password, data)
         .then(function (encryptedData) {
-          let encryptedObject = JSON.parse(encryptedData)
+          const encryptedObject = JSON.parse(encryptedData)
           assert.ok(encryptedObject.data, 'there is no data')
-          assert.ok(encryptedObject.iv && encryptedObject.iv.length != 0, 'there is no iv')
-          assert.ok(encryptedObject.salt && encryptedObject.salt.length != 0, 'there is no salt')
+          assert.ok(encryptedObject.iv && encryptedObject.iv.length !== 0, 'there is no iv')
+          assert.ok(encryptedObject.salt && encryptedObject.salt.length !== 0, 'there is no salt')
           done()
         }).catch(function (err) {
           done(err)
@@ -56,7 +56,7 @@ describe('EdgeEncryptor', function () {
         assert.notEqual(encryptedData[1].length, 0)
         done()
       })
-    })    
+    })
   })
 
   describe('decrypt', function () {
diff --git a/test/unit/app/nodeify-test.js b/test/unit/app/nodeify-test.js
index 901603c8b..938b76c68 100644
--- a/test/unit/app/nodeify-test.js
+++ b/test/unit/app/nodeify-test.js
@@ -13,8 +13,12 @@ describe('nodeify', function () {
   it('should retain original context', function (done) {
     var nodified = nodeify(obj.promiseFunc, obj)
     nodified('baz', function (err, res) {
-      assert.equal(res, 'barbaz')
-      done()
+      if (!err) {
+        assert.equal(res, 'barbaz')
+        done()
+      } else {
+        done(new Error(err.toString()))
+      }
     })
   })
 
diff --git a/test/unit/app/pending-balance-test.js b/test/unit/app/pending-balance-test.js
index 1418e4a4e..508635c46 100644
--- a/test/unit/app/pending-balance-test.js
+++ b/test/unit/app/pending-balance-test.js
@@ -2,7 +2,6 @@ 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 = {}
 
 const zeroBn = new BN(0)
 const etherBn = new BN(String(1e18))
@@ -20,7 +19,7 @@ describe('PendingBalanceCalculator', function () {
           value: ether,
           gasPrice: '0x0',
           gas: '0x0',
-        }
+        },
       }, { count: 1 })
 
       const balanceCalculator = generateBalanceCalcWith([], zeroBn)
@@ -36,7 +35,7 @@ describe('PendingBalanceCalculator', function () {
           value: '0x0',
           gasPrice: '0x2',
           gas: '0x3',
-        }
+        },
       }, { count: 1 })
 
       const balanceCalculator = generateBalanceCalcWith([], zeroBn)
@@ -66,7 +65,7 @@ describe('PendingBalanceCalculator', function () {
           value: ether,
           gasPrice: '0x0',
           gas: '0x0',
-        }
+        },
       }, { count: 1 })
 
       balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn)
diff --git a/test/unit/app/seed-phrase-verifier-test.js b/test/unit/app/seed-phrase-verifier-test.js
index b0da534da..d8720d5a0 100644
--- a/test/unit/app/seed-phrase-verifier-test.js
+++ b/test/unit/app/seed-phrase-verifier-test.js
@@ -9,11 +9,10 @@ describe('SeedPhraseVerifier', function () {
 
   describe('verifyAccounts', function () {
 
-    let password = 'passw0rd1'
-    let hdKeyTree = 'HD Key Tree'
+    const password = 'passw0rd1'
+    const hdKeyTree = 'HD Key Tree'
 
     let keyringController
-    let vault
     let primaryKeyring
 
     beforeEach(async function () {
@@ -24,60 +23,60 @@ describe('SeedPhraseVerifier', function () {
 
       assert(keyringController)
 
-      vault = await keyringController.createNewVaultAndKeychain(password)
+      await keyringController.createNewVaultAndKeychain(password)
       primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
     })
 
     it('should be able to verify created account with seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
     })
 
     it('should be able to verify created account (upper case) with seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let upperCaseAccounts = [createdAccounts[0].toUpperCase()]
+      const upperCaseAccounts = [createdAccounts[0].toUpperCase()]
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(upperCaseAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(upperCaseAccounts, seedWords)
     })
 
     it('should be able to verify created account (lower case) with seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
-      let lowerCaseAccounts = [createdAccounts[0].toLowerCase()]
+      const lowerCaseAccounts = [createdAccounts[0].toLowerCase()]
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(lowerCaseAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(lowerCaseAccounts, seedWords)
     })
 
     it('should return error with good but different seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
-      
-      try { 
-        let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
-        assert.fail("Should reject")
+      await primaryKeyring.serialize()
+      const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+
+      try {
+        await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
+        assert.fail('Should reject')
       } catch (err) {
         assert.ok(err.message.indexOf('Not identical accounts!') >= 0, 'Wrong error message')
       }
@@ -85,15 +84,15 @@ describe('SeedPhraseVerifier', function () {
 
     it('should return error with undefined existing accounts', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+      await primaryKeyring.serialize()
+      const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
 
-      try { 
-        let result = await seedPhraseVerifier.verifyAccounts(undefined, seedWords)
-        assert.fail("Should reject")
+      try {
+        await seedPhraseVerifier.verifyAccounts(undefined, seedWords)
+        assert.fail('Should reject')
       } catch (err) {
         assert.equal(err.message, 'No created accounts defined.')
       }
@@ -101,15 +100,15 @@ describe('SeedPhraseVerifier', function () {
 
     it('should return error with empty accounts array', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+      await primaryKeyring.serialize()
+      const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
 
-      try { 
-        let result = await seedPhraseVerifier.verifyAccounts([], seedWords)
-        assert.fail("Should reject")
+      try {
+        await seedPhraseVerifier.verifyAccounts([], seedWords)
+        assert.fail('Should reject')
       } catch (err) {
         assert.equal(err.message, 'No created accounts defined.')
       }
@@ -117,17 +116,17 @@ describe('SeedPhraseVerifier', function () {
 
     it('should be able to verify more than one created account with seed words', async function () {
 
-      const keyState = await keyringController.addNewAccount(primaryKeyring)
-      const keyState2 = await keyringController.addNewAccount(primaryKeyring)
+      await keyringController.addNewAccount(primaryKeyring)
+      await keyringController.addNewAccount(primaryKeyring)
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 3)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
     })
   })
 })
diff --git a/test/unit/app/util-test.js b/test/unit/app/util-test.js
index 670bc4d22..656b22d92 100644
--- a/test/unit/app/util-test.js
+++ b/test/unit/app/util-test.js
@@ -38,4 +38,4 @@ describe('SufficientBalance', function () {
     const result = sufficientBalance(tx, balance)
     assert.ok(!result, 'insufficient balance found.')
   })
-})
\ No newline at end of file
+})