From 5b9a6bd367173330d8bcfd973278eeba6f31ec06 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 25 Jul 2017 13:16:46 -0700
Subject: tx cont - remove old cb from async fn

---
 app/scripts/controllers/transactions.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 5f3d84ebe..fc91bdf4d 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -458,7 +458,7 @@ module.exports = class TransactionController extends EventEmitter {
     }))
   }
 
-  async _resubmitTx (txMeta, cb) {
+  async _resubmitTx (txMeta) {
     const address = txMeta.txParams.from
     const balance = this.ethStore.getState().accounts[address].balance
     if (!('retryCount' in txMeta)) txMeta.retryCount = 0
@@ -467,17 +467,17 @@ module.exports = class TransactionController extends EventEmitter {
     if (!this.txProviderUtils.sufficientBalance(txMeta.txParams, balance)) {
       const message = 'Insufficient balance.'
       this.setTxStatusFailed(txMeta.id, { message })
-      cb()
-      return log.error(message)
+      log.error(message)
+      return
     }
 
     // Only auto-submit already-signed txs:
-    if (!('rawTx' in txMeta)) return cb()
+    if (!('rawTx' in txMeta)) return
 
     // Increment a try counter.
     txMeta.retryCount++
     const rawTx = txMeta.rawTx
-    return await this.txProviderUtils.publishTransaction(rawTx, cb)
+    return await this.txProviderUtils.publishTransaction(rawTx)
   }
 
   // checks the network for signed txs and
-- 
cgit 


From 4445ba15694fc6ef7f9c4e3a2de5de5428e28b3a Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 25 Jul 2017 14:36:19 -0700
Subject: tx cont - add argument for provider constructor

---
 app/scripts/controllers/network.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index c07f13b8d..0a3e5e26b 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -28,9 +28,9 @@ module.exports = class NetworkController extends EventEmitter {
     this._provider = provider
   }
 
-  initializeProvider (opts) {
+  initializeProvider (opts, providerContructor = MetaMaskProvider) {
     this.providerInit = opts
-    this._provider = MetaMaskProvider(opts)
+    this._provider = providerContructor(opts)
     this._proxy = new Proxy(this._provider, {
       get: (obj, name) => {
         if (name === 'on') return this._on.bind(this)
@@ -38,6 +38,7 @@ module.exports = class NetworkController extends EventEmitter {
       },
       set: (obj, name, value) => {
         this._provider[name] = value
+        return value
       },
     })
     this.provider.on('block', this._logBlock.bind(this))
-- 
cgit