refactor: improve ticker error messages

This commit is contained in:
siiky 2023-11-27 12:33:26 +00:00
parent 0168fe4994
commit 30dffce655

View file

@ -16,13 +16,13 @@ const PEGGED_FIAT_CURRENCIES = { NAD: 'ZAR' }
const FALLBACK_TICKER = 'bitpay' const FALLBACK_TICKER = 'bitpay'
const hasRatesOrReject = r => _.get(['rates'], r) ? const hasRatesOrReject = emsg => r => _.get(['rates'], r) ?
r : r :
Promise.reject(new Error("Failed to get ticker rates")) Promise.reject(new Error(emsg))
const get1 = (market, fiatCode, cryptoCode, ticker) => const get1 = (market, fiatCode, cryptoCode, ticker, emsg) =>
buildTicker(fiatCode, cryptoCode, ticker) buildTicker(fiatCode, cryptoCode, ticker)
.then(hasRatesOrReject) .then(hasRatesOrReject(emsg))
.then(({ rates }) => { .then(({ rates }) => {
return lastRate[market] = { rates, timestamp: Date.now() } return lastRate[market] = { rates, timestamp: Date.now() }
}) })
@ -31,14 +31,18 @@ const _getRates = (settings, fiatCode, cryptoCode) => Promise.resolve()
.then(() => { .then(() => {
const ticker = configManager.getWalletSettings(cryptoCode, settings.config).ticker const ticker = configManager.getWalletSettings(cryptoCode, settings.config).ticker
const market = [cryptoCode, fiatCode].join('-') const market = [cryptoCode, fiatCode].join('-')
return get1(market, fiatCode, cryptoCode, ticker) const isMainFallback = ticker === FALLBACK_TICKER
const emsg = isMainFallback ?
"Failed to get ticker rates" :
"Failed to get rates with configured ticker, trying fallback"
return get1(market, fiatCode, cryptoCode, ticker, emsg)
.catch(err => { .catch(err => {
logger.error(err) logger.error(err)
return ticker === FALLBACK_TICKER ? return isMainFallback ?
lastRate[market] : lastRate[market] :
get1(market, fiatCode, cryptoCode, FALLBACK_TICKER) get1(market, fiatCode, cryptoCode, FALLBACK_TICKER, "Failed to get rates with fallback ticker")
}) })
.then(hasRatesOrReject) .then(hasRatesOrReject("Failed to get ticker rates"))
}) })
function buildTicker (fiatCode, cryptoCode, tickerName) { function buildTicker (fiatCode, cryptoCode, tickerName) {