Merge branch 'master' into 3.8.5

2 files changed, 71 insertions, 33 deletions

diff --git a/test/unit/infura-controller-test.js b/test/unit/infura-controller-test.js
index 7a2a114f9..912867764 100644
--- a/test/unit/infura-controller-test.js
+++ b/test/unit/infura-controller-test.js
@@ -1,34 +1,34 @@
 // polyfill fetch
-global.fetch = function () {return Promise.resolve({
-    json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
-  })
-}
-const assert = require('assert')
-const InfuraController = require('../../app/scripts/controllers/infura')
-
-describe('infura-controller', function () {
-  var infuraController
-
-  beforeEach(function () {
-    infuraController = new InfuraController()
-  })
-
-  describe('network status queries', function () {
-    describe('#checkInfuraNetworkStatus', function () {
-      it('should return an object reflecting the network statuses', function (done) {
-        this.timeout(15000)
-        infuraController.checkInfuraNetworkStatus()
-          .then(() => {
-            const networkStatus = infuraController.store.getState().infuraNetworkStatus
-            assert.equal(Object.keys(networkStatus).length, 4)
-            assert.equal(networkStatus.mainnet, 'ok')
-            assert.equal(networkStatus.ropsten, 'degraded')
-            assert.equal(networkStatus.kovan, 'down')
-          })
-          .then(() => done())
-          .catch(done)
-
-      })
-    })
-  })
-})
+// global.fetch = function () {return Promise.resolve({
+//     json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
+//   })
+// }
+// const assert = require('assert')
+// const InfuraController = require('../../app/scripts/controllers/infura')
+//
+// describe('infura-controller', function () {
+//   var infuraController
+//
+//   beforeEach(function () {
+//     infuraController = new InfuraController()
+//   })
+//
+//   describe('network status queries', function () {
+//     describe('#checkInfuraNetworkStatus', function () {
+//       it('should return an object reflecting the network statuses', function (done) {
+//         this.timeout(15000)
+//         infuraController.checkInfuraNetworkStatus()
+//           .then(() => {
+//             const networkStatus = infuraController.store.getState().infuraNetworkStatus
+//             assert.equal(Object.keys(networkStatus).length, 4)
+//             assert.equal(networkStatus.mainnet, 'ok')
+//             assert.equal(networkStatus.ropsten, 'degraded')
+//             assert.equal(networkStatus.kovan, 'down')
+//           })
+//           .then(() => done())
+//           .catch(done)
+//
+//       })
+//     })
+//   })
+// })
diff --git a/test/unit/tx-utils-test.js b/test/unit/tx-utils-test.js
index 7ace1f587..a43bcfb35 100644
--- a/test/unit/tx-utils-test.js
+++ b/test/unit/tx-utils-test.js
@@ -16,6 +16,44 @@ describe('txUtils', function () {
     }))
   })
 
+  describe('#sufficientBalance', function () {
+    it('returns true if max tx cost is equal to balance.', function () {
+      const tx = {
+        'value': '0x1',
+        'gas': '0x2',
+        'gasPrice': '0x3',
+      }
+      const balance = '0x8'
+
+      const result = txUtils.sufficientBalance(tx, balance)
+      assert.ok(result, 'sufficient balance found.')
+    })
+
+    it('returns true if max tx cost is less than balance.', function () {
+      const tx = {
+        'value': '0x1',
+        'gas': '0x2',
+        'gasPrice': '0x3',
+      }
+      const balance = '0x9'
+
+      const result = txUtils.sufficientBalance(tx, balance)
+      assert.ok(result, 'sufficient balance found.')
+    })
+
+    it('returns false if max tx cost is more than balance.', function () {
+      const tx = {
+        'value': '0x1',
+        'gas': '0x2',
+        'gasPrice': '0x3',
+      }
+      const balance = '0x6'
+
+      const result = txUtils.sufficientBalance(tx, balance)
+      assert.ok(!result, 'insufficient balance found.')
+    })
+  })
+
   describe('chain Id', function () {
     it('prepares a transaction with the provided chainId', function () {
       const txParams = {