From 580d93188cb77cb4d4ce809b46dade8525efc380 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Fri, 13 Jan 2017 17:47:20 -0800
Subject: Satisfy review needs: removed unnecessary this.query = opts.query
 from constructor Created a tx error state for errors in approveTransaction
 validateTxParams has been moved to tx-utils removed "value" arg from
 _setTxStatus

---
 app/scripts/lib/tx-utils.js        | 14 ++++++++++++--
 app/scripts/transaction-manager.js | 30 +++++++++++-------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index eba537d0a..5116cb93b 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -16,7 +16,7 @@ module.exports = class txProviderUtils {
     this.provider = provider
     this.query = new EthQuery(provider)
   }
-  
+
   analyzeGasUsage (txData, cb) {
     var self = this
     this.query.getBlockByNumber('latest', true, (err, block) => {
@@ -113,10 +113,20 @@ module.exports = class txProviderUtils {
   publishTransaction (rawTx, cb) {
     this.query.sendRawTransaction(rawTx, cb)
   }
+
+  validateTxParams (txParams, cb) {
+    if (('value' in txParams) && txParams.value.indexOf('-') === 0) {
+      cb(new Error(`Invalid transaction value of ${txParams.value} not a positive number.`))
+    } else {
+      cb()
+    }
+  }
+
+
 }
 
 // util
 
 function isUndef(value) {
   return value === undefined
-}
\ No newline at end of file
+}
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js
index 5e0544755..9462d166e 100644
--- a/app/scripts/transaction-manager.js
+++ b/app/scripts/transaction-manager.js
@@ -14,7 +14,6 @@ module.exports = class TransactionManager extends EventEmitter {
     this.txHistoryLimit = opts.txHistoryLimit
     this.getSelectedAccount = opts.getSelectedAccount
     this.provider = opts.provider
-    this.query = opts.query
     this.blockTracker = opts.blockTracker
     this.txProviderUtils = new TxProviderUtil(this.provider)
     this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
@@ -95,7 +94,7 @@ module.exports = class TransactionManager extends EventEmitter {
     let txMeta
     async.waterfall([
       // validate
-      (cb) => this.validateTxParams(txParams, cb),
+      (cb) => this.txProviderUtils.validateTxParams(txParams, cb),
       // prepare txMeta
       (cb) => {
         // create txMeta obj with parameters and meta data
@@ -117,7 +116,6 @@ module.exports = class TransactionManager extends EventEmitter {
       // save txMeta
       (cb) => {
         this.addTx(txMeta)
-        debugger
         this.setMaxTxCostAndFee(txMeta)
         cb(null, txMeta)
       },
@@ -161,7 +159,7 @@ module.exports = class TransactionManager extends EventEmitter {
         (rawTx, cb) => self.publishTransaction(txId, rawTx, cb),
       ], (err) => {
         self.nonceLock.leave()
-        // TODO: move tx to error state
+        this.setTxStatusFailed(txId)
         if (err) return cb(err)
         cb()
       })
@@ -198,19 +196,11 @@ module.exports = class TransactionManager extends EventEmitter {
   publishTransaction (txId, rawTx, cb) {
     this.txProviderUtils.publishTransaction(rawTx, (err) => {
       if (err) return cb(err)
-      this.setTxStatusSubmitted(txId, rawTx)
+      this.setTxStatusSubmitted(txId)
       cb()
     })
   }
 
-  validateTxParams (txParams, cb) {
-    if (('value' in txParams) && txParams.value.indexOf('-') === 0) {
-      cb(new Error(`Invalid transaction value of ${txParams.value} not a positive number.`))
-    } else {
-      cb()
-    }
-  }
-
   // receives a signed tx object and updates the tx hash
   updateTxAsSigned (txId, ethTx) {
     // Add the tx hash to the persisted meta-tx object
@@ -279,8 +269,8 @@ module.exports = class TransactionManager extends EventEmitter {
   }
 
   // should update the status of the tx to 'submitted'.
-  setTxStatusSubmitted (txId, rawTx) {
-    this._setTxStatus(txId, 'submitted', rawTx)
+  setTxStatusSubmitted (txId) {
+    this._setTxStatus(txId, 'submitted')
   }
 
   // should update the status of the tx to 'confirmed'.
@@ -288,6 +278,9 @@ module.exports = class TransactionManager extends EventEmitter {
     this._setTxStatus(txId, 'confirmed')
   }
 
+  setTxStatusFailed (txId) {
+    this._setTxStatus(txId, 'failed')
+  }
 
   // merges txParams obj onto txData.txParams
   // use extend to ensure that all fields are filled
@@ -311,7 +304,7 @@ module.exports = class TransactionManager extends EventEmitter {
           message: 'We had an error while submitting this transaction, please try again.',
         }
         this.updateTx(txMeta)
-        return this._setTxStatus(txId, 'failed')
+        return this.setTxStatusFailed(txId)
       }
       this.txProviderUtils.query.getTransactionByHash(txHash, (err, txParams) => {
         if (err || !txParams) {
@@ -342,11 +335,10 @@ module.exports = class TransactionManager extends EventEmitter {
   //    - `'signed'` the tx is signed
   //    - `'submitted'` the tx is sent to a server
   //    - `'confirmed'` the tx has been included in a block.
-  // "value" is an optional parameter to emit
-  _setTxStatus (txId, status, value) {
+  _setTxStatus (txId, status) {
     var txMeta = this.getTx(txId)
     txMeta.status = status
-    this.emit(`${txMeta.id}:${status}`, value)
+    this.emit(`${txMeta.id}:${status}`, txId)
     this.emit('updateBadge')
     this.updateTx(txMeta)
   }
-- 
cgit v1.2.3