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

fix: pr fixes

Browse source
This commit is contained in:
Taranto 2020-03-20 17:55:55 +00:00 • committed by Josh Harvey
parent fa69d2a030
commit 1cc3c820b5
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/cash-out/cash-out-helper.js
View file

@ -16,7 +16,8 @@ function convertBigNumFields (obj) {
return value.toString() return value.toString()
} }
if (_.includes(key, [ 'commissionPercentage', 'rawTickerPrice' ]) && value) { // Only test isNil for these fields since the others should not be empty.
if (_.includes(key, [ 'commissionPercentage', 'rawTickerPrice' ]) && !_.isNil(value)) {
return value.toString() return value.toString()
} }

6
lib/plugins/wallet/mock-wallet/mock-wallet.js
View file

@ -79,9 +79,9 @@ function newFunding (account, cryptoCode) {
function getStatus (account, toAddress, cryptoAtoms, cryptoCode) { function getStatus (account, toAddress, cryptoAtoms, cryptoCode) {
const elapsed = Date.now() - t0 const elapsed = Date.now() - t0
if (elapsed < PUBLISH_TIME) return Promise.resolve({ receivedCryptoAtoms: cryptoAtoms - 10, status: 'notSeen' }) if (elapsed < PUBLISH_TIME) return Promise.resolve({ receivedCryptoAtoms: BN(0), status: 'notSeen' })
if (elapsed < AUTHORIZE_TIME) return Promise.resolve({ receivedCryptoAtoms: cryptoAtoms - 10, status: 'published' }) if (elapsed < AUTHORIZE_TIME) return Promise.resolve({ receivedCryptoAtoms: cryptoAtoms, status: 'published' })
if (elapsed < CONFIRM_TIME) return Promise.resolve({ receivedCryptoAtoms: null, status: 'authorized' }) if (elapsed < CONFIRM_TIME) return Promise.resolve({ receivedCryptoAtoms: cryptoAtoms, status: 'authorized' })
console.log('[%s] DEBUG: Mock wallet has confirmed transaction [%s]', cryptoCode, toAddress.slice(0, 5)) console.log('[%s] DEBUG: Mock wallet has confirmed transaction [%s]', cryptoCode, toAddress.slice(0, 5))

2
lib/wallet.js
View file

@ -126,7 +126,7 @@ function getWalletStatus (settings, tx) {
const fudgeFactor = fudgeFactorEnabled ? 10 : 0 const fudgeFactor = fudgeFactorEnabled ? 10 : 0
const walletStatusPromise = fetchWallet(settings, tx.cryptoCode) const walletStatusPromise = fetchWallet(settings, tx.cryptoCode)
.then(r => r.wallet.getStatus(r.account, tx.toAddress, tx.cryptoAtoms.add(fudgeFactor), tx.cryptoCode)) .then(r => r.wallet.getStatus(r.account, tx.toAddress, tx.cryptoAtoms.minus(fudgeFactor), tx.cryptoCode))
return Promise.all([ return Promise.all([
walletStatusPromise, walletStatusPromise,