Merge branch 'master' into betterErrorsOnTx

2 files changed, 27 insertions, 17 deletions

diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js
index 0c7ee9d70..87c2ee7a3 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/network-contoller-test.js
@@ -3,6 +3,9 @@ const NetworkController = require('../../app/scripts/controllers/network')
 
 describe('# Network Controller', function () {
   let networkController
+  const networkControllerProviderInit = {
+    getAccounts: () => {},
+  }
 
   beforeEach(function () {
     networkController = new NetworkController({
@@ -10,26 +13,13 @@ describe('# Network Controller', function () {
         type: 'rinkeby',
       },
     })
-    // stub out provider
-    networkController._provider = new Proxy({}, {
-      get: (obj, name) => {
-        return () => {}
-      },
-    })
-    networkController.providerInit = {
-      getAccounts: () => {},
-    }
 
-    networkController.ethQuery = new Proxy({}, {
-      get: (obj, name) => {
-        return () => {}
-      },
-    })
+    networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
   })
   describe('network', function () {
     describe('#provider', function () {
       it('provider should be updatable without reassignment', function () {
-        networkController.initializeProvider(networkController.providerInit)
+        networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
         const provider = networkController.provider
         networkController._provider = {test: true}
         assert.ok(provider.test)
@@ -75,3 +65,19 @@ describe('# Network Controller', function () {
     })
   })
 })
+
+function dummyProviderConstructor() {
+  return {
+    // provider
+    sendAsync: noop,
+    // block tracker
+    start: noop,
+    stop: noop,
+    on: noop,
+    addListener: noop,
+    once: noop,
+    removeAllListeners: noop,
+  }
+}
+
+function noop() {}
\ No newline at end of file
diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 7b86cfe14..31908569a 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -343,13 +343,17 @@ describe('Transaction Controller', function () {
       // Adding the fake tx:
       txController.addTx(clone(txMeta))
 
-      txController._resubmitTx(txMeta, function (err) {
-        assert.ifError(err, 'should not throw an error')
+      txController._resubmitTx(txMeta)
+      .then(() => {
         const updatedMeta = txController.getTx(txMeta.id)
         assert.notEqual(updatedMeta.status, txMeta.status, 'status changed.')
         assert.equal(updatedMeta.status, 'failed', 'tx set to failed.')
         done()
       })
+      .catch((err) => {
+        assert.ifError(err, 'should not throw an error')
+        done()
+      })
     })
   })
 })