lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fixups in cash_in_txs

Browse source
This commit is contained in:
Josh Harvey 2017-12-01 14:17:53 +02:00
parent ed298283c7
commit 29f85a77d7
1 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/cash-in-tx.js
View file

@ -83,6 +83,7 @@ function ensureRatchet (oldField, newField, fieldKey) {
return true return true
} }
if (_.isNil(newField)) return false
if (oldField.isBigNumber && newField.isBigNumber) return BN(oldField).eq(newField) if (oldField.isBigNumber && newField.isBigNumber) return BN(oldField).eq(newField)
if (oldField.toString() === newField.toString()) return true if (oldField.toString() === newField.toString()) return true
@ -231,7 +232,8 @@ function isClearToSend (oldTx, newTx) {
function postProcess (r, pi) { function postProcess (r, pi) {
registerTrades(pi, r.newBills) registerTrades(pi, r.newBills)
if (isClearToSend(r.dbTx, r.tx)) { if (!isClearToSend(r.dbTx, r.tx)) return Promise.resolve({})
return pi.sendCoins(r.tx) return pi.sendCoins(r.tx)
.then(txHash => ({ .then(txHash => ({
txHash, txHash,
@ -257,9 +259,6 @@ function postProcess (r, pi) {
} }
}) })
.then(sendRec => logAction(sendRec, r.tx)) .then(sendRec => logAction(sendRec, r.tx))
}
return Promise.resolve({})
} }
function preProcess (dbTx, machineTx, pi) { function preProcess (dbTx, machineTx, pi) {