From 30dffce655984d8ba58141517cc4cef24d3009e7 Mon Sep 17 00:00:00 2001 From: siiky Date: Mon, 27 Nov 2023 12:33:26 +0000 Subject: [PATCH] refactor: improve ticker error messages --- lib/ticker.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/ticker.js b/lib/ticker.js index 3fe9a7ad..c25e7478 100644 --- a/lib/ticker.js +++ b/lib/ticker.js @@ -16,13 +16,13 @@ const PEGGED_FIAT_CURRENCIES = { NAD: 'ZAR' } const FALLBACK_TICKER = 'bitpay' -const hasRatesOrReject = r => _.get(['rates'], r) ? +const hasRatesOrReject = emsg => r => _.get(['rates'], 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) - .then(hasRatesOrReject) + .then(hasRatesOrReject(emsg)) .then(({ rates }) => { return lastRate[market] = { rates, timestamp: Date.now() } }) @@ -31,14 +31,18 @@ const _getRates = (settings, fiatCode, cryptoCode) => Promise.resolve() .then(() => { const ticker = configManager.getWalletSettings(cryptoCode, settings.config).ticker 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 => { logger.error(err) - return ticker === FALLBACK_TICKER ? + return isMainFallback ? 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) {