m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

transactions - lint fixes

Browse Source
This commit is contained in:
frankiebee 2018-04-10 14:53:40 -07:00
parent 2d7c3c2b00
commit 5494aa4f9c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scripts/controllers/transactions/lib/util.js
View File

@ -7,7 +7,7 @@ module.exports = {
normalizeTxParams,
validateTxParams,
validateFrom,
validateRecipient
validateRecipient,
}
@ -48,19 +48,19 @@ function validateTxParams (txParams) {
}
function validateFrom (txParams) {
if ( !(typeof txParams.from === 'string') ) throw new Error(`Invalid from address ${txParams.from} not a string`)
if (!(typeof txParams.from === 'string')) throw new Error(`Invalid from address ${txParams.from} not a string`)
if (!isValidAddress(txParams.from)) throw new Error('Invalid from address')
}
function validateRecipient (txParams) {
if (txParams.to === '0x' || txParams.to === null ) {
if (txParams.to === '0x' || txParams.to === null) {
if (txParams.data) {
delete txParams.to
} else {
throw new Error('Invalid recipient address')
}
} else if ( txParams.to !== undefined && !isValidAddress(txParams.to) ) {
} else if (txParams.to !== undefined && !isValidAddress(txParams.to)) {
throw new Error('Invalid recipient address')
}
return txParams
}
}

2
app/scripts/controllers/transactions/tx-gas-utils.js
View File

@ -100,4 +100,4 @@ module.exports = class TxGasUtil {
// otherwise use blockGasLimit
return bnToHex(upperGasLimitBn)
}
}
}

12
app/scripts/controllers/transactions/tx-state-manager.js
View File

@ -92,7 +92,7 @@ module.exports = class TransactionStateManager extends EventEmitter {
// or rejected tx's.
// not tx's that are pending or unapproved
if (txCount > txHistoryLimit - 1) {
let index = transactions.findIndex((metaTx) => {
const index = transactions.findIndex((metaTx) => {
return this.getFinalStates().includes(metaTx.status)
})
if (index !== -1) {
@ -145,7 +145,7 @@ module.exports = class TransactionStateManager extends EventEmitter {
}
// validates txParams members by type
validateTxParams(txParams) {
validateTxParams (txParams) {
Object.keys(txParams).forEach((key) => {
const value = txParams[key]
// validate types
@ -263,10 +263,10 @@ module.exports = class TransactionStateManager extends EventEmitter {
// returns an array of states that can be considered final
getFinalStates () {
return [
'rejected', // the user has responded no!
'confirmed', // the tx has been included in a block.
'failed', // the tx failed for some reason, included on tx data.
'dropped', // the tx nonce was already used
'rejected', // the user has responded no!
'confirmed', // the tx has been included in a block.
'failed', // the tx failed for some reason, included on tx data.
'dropped', // the tx nonce was already used
]
}