aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-04-05 05:56:30 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-04-05 05:57:27 +0800
commit245c01bc0fed585c4ac8ed05edf7ebe1a65de80b (patch)
tree72dd6dbf4c97409b54bfe857bbe8cb18b6dc7849 /app
parent6ab938546c3b41d188df62f0cc180aa9b6c72cf6 (diff)
downloadtangerine-wallet-browser-245c01bc0fed585c4ac8ed05edf7ebe1a65de80b.tar
tangerine-wallet-browser-245c01bc0fed585c4ac8ed05edf7ebe1a65de80b.tar.gz
tangerine-wallet-browser-245c01bc0fed585c4ac8ed05edf7ebe1a65de80b.tar.bz2
tangerine-wallet-browser-245c01bc0fed585c4ac8ed05edf7ebe1a65de80b.tar.lz
tangerine-wallet-browser-245c01bc0fed585c4ac8ed05edf7ebe1a65de80b.tar.xz
tangerine-wallet-browser-245c01bc0fed585c4ac8ed05edf7ebe1a65de80b.tar.zst
tangerine-wallet-browser-245c01bc0fed585c4ac8ed05edf7ebe1a65de80b.zip
transactions - make #_validateTxParams not async and "linting" wink wink nudge nudge
Diffstat (limited to 'app')
-rw-r--r--app/scripts/controllers/transactions.js19
1 files changed, 12 insertions, 7 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 9568fcbb9..a73a8b36d 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -185,7 +185,7 @@ module.exports = class TransactionController extends EventEmitter {
async addUnapprovedTransaction (txParams) {
// validate
- await this._validateTxParams(txParams)
+ this._validateTxParams(txParams)
this._normalizeTxParams(txParams)
// construct txMeta
let txMeta = this.txStateManager.generateTxMeta({txParams})
@@ -317,13 +317,18 @@ module.exports = class TransactionController extends EventEmitter {
_normalizeTxParams (txParams) {
delete txParams.chainId
- if ( !txParams.to ) delete txParams.to
- else txParams.to = ethUtil.addHexPrefix(txParams.to)
-
+ if ( !txParams.to ) {
+ delete txParams.to
+ } else {
+ txParams.to = ethUtil.addHexPrefix(txParams.to)
+ }
txParams.from = ethUtil.addHexPrefix(txParams.from).toLowerCase()
- if (!txParams.data) delete txParams.data
- else txParams.data = ethUtil.addHexPrefix(txParams.data)
+ if (!txParams.data) {
+ delete txParams.data
+ } else {
+ txParams.data = ethUtil.addHexPrefix(txParams.data)
+ }
if (txParams.value) txParams.value = ethUtil.addHexPrefix(txParams.value)
@@ -331,7 +336,7 @@ module.exports = class TransactionController extends EventEmitter {
if (txParams.gasPrice) txParams.gas = ethUtil.addHexPrefix(txParams.gas)
}
- async _validateTxParams (txParams) {
+ _validateTxParams (txParams) {
this._validateFrom(txParams)
this._validateRecipient(txParams)
if ('value' in txParams) {