From cf6817092b92930ab96e1c9e610669b485b384ff Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 4 Jan 2017 15:03:45 -0800 Subject: remove unnecessary try statments --- app/scripts/transaction-manager.js | 40 ++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'app/scripts/transaction-manager.js') 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()) - - // 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) - } - }) + 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 + return Promise.resolve({ethTx, address, txId}) } // receives a signed tx object and updates the tx hash -- cgit