From cf6817092b92930ab96e1c9e610669b485b384ff Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Wed, 4 Jan 2017 15:03:45 -0800
Subject: [PATCH] remove unnecessary try statments

---
 app/scripts/keyring-controller.js  | 18 +++++---------
 app/scripts/metamask-controller.js |  3 +--
 app/scripts/transaction-manager.js | 38 +++++++++++++-----------------
 3 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 1a26a887f..c58be0aae 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -318,18 +318,12 @@ module.exports = class KeyringController extends EventEmitter {
   // TX Manager to update the state after signing
 
   signTransaction (ethTx, selectedAddress, txId) {
-    return new Promise((resolve, reject) => {
-      try {
-        const address = normalize(selectedAddress)
-        return this.getKeyringForAccount(address)
-        .then((keyring) => {
-          return keyring.signTransaction(address, ethTx)
-        }).then((tx) => {
-          resolve({tx, txId})
-        })
-      } catch (e) {
-        reject(e)
-      }
+    const address = normalize(selectedAddress)
+    return this.getKeyringForAccount(address)
+    .then((keyring) => {
+      return keyring.signTransaction(address, ethTx)
+    }).then((tx) => {
+      return {tx, txId}
     })
   }
   // Add Unconfirmed Message
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 4caad46e1..d520a59ad 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -165,7 +165,6 @@ module.exports = class MetamaskController {
   sendUpdate () {
     this.getState()
     .then((state) => {
-
       this.listeners.forEach((remote) => {
         remote.sendUpdate(state)
       })
@@ -461,7 +460,7 @@ module.exports = class MetamaskController {
     return this.state.network
   }
 
-  markAccountsFound(cb) {
+  markAccountsFound (cb) {
     this.configManager.setLostAccounts([])
     this.sendUpdate()
     cb(null, this.getState())
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js
index a2dba69b5..6becfa6d1 100644
--- a/app/scripts/transaction-manager.js
+++ b/app/scripts/transaction-manager.js
@@ -138,29 +138,23 @@ module.exports = class TransactionManager extends EventEmitter {
 
   // formats txParams so the keyringController can sign it
   formatTxForSigining (txParams) {
-    return new Promise((resolve, reject) => {
-      try {
-        var address = txParams.from
-        var metaTx = this.getTx(txParams.metamaskId)
-        var gasMultiplier = metaTx.gasMultiplier
-        var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
-        gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10))
-        txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
+    var address = txParams.from
+    var metaTx = this.getTx(txParams.metamaskId)
+    var gasMultiplier = metaTx.gasMultiplier
+    var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
+    gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10))
+    txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
 
-        // normalize values
-        txParams.to = normalize(txParams.to)
-        txParams.from = normalize(txParams.from)
-        txParams.value = normalize(txParams.value)
-        txParams.data = normalize(txParams.data)
-        txParams.gasLimit = normalize(txParams.gasLimit || txParams.gas)
-        txParams.nonce = normalize(txParams.nonce)
-        const ethTx = new Transaction(txParams)
-        var txId = txParams.metamaskId
-        resolve({ethTx, address, txId})
-      } catch (err) {
-        reject(err)
-      }
-    })
+    // normalize values
+    txParams.to = normalize(txParams.to)
+    txParams.from = normalize(txParams.from)
+    txParams.value = normalize(txParams.value)
+    txParams.data = normalize(txParams.data)
+    txParams.gasLimit = normalize(txParams.gasLimit || txParams.gas)
+    txParams.nonce = normalize(txParams.nonce)
+    const ethTx = new Transaction(txParams)
+    var txId = txParams.metamaskId
+    return Promise.resolve({ethTx, address, txId})
   }
 
   // receives a signed tx object and updates the tx hash