fix: node fetching error handling

This commit is contained in:
Sérgio Salgado 2022-05-25 19:26:31 +01:00
parent 9abd8b2a88
commit 6aca242f9b
3 changed files with 20 additions and 4 deletions

View file

@ -7,6 +7,7 @@ const request = require('request-promise')
const { utils: coinUtils } = require('@lamassu/coins') const { utils: coinUtils } = require('@lamassu/coins')
const options = require('../../options') const options = require('../../options')
const logger = require('../../logger')
const blockchainDir = options.blockchainDir const blockchainDir = options.blockchainDir
@ -116,6 +117,9 @@ function rpcConfig (cryptoRec) {
port: config.rpcport || cryptoRec.defaultPort port: config.rpcport || cryptoRec.defaultPort
} }
} catch (err) { } catch (err) {
throw new Error('Wallet is currently not installed') logger.error('Wallet is currently not installed!')
return {
port: cryptoRec.defaultPort
}
} }
} }

View file

@ -6,7 +6,7 @@ const { default: PQueue } = require('p-queue')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')
const { logger } = require('../../../blockchain/common') const logger = require('../../../logger')
const options = require('../../../options') const options = require('../../../options')
const jsonRpc = require('../../common/json-rpc') const jsonRpc = require('../../common/json-rpc')
@ -40,7 +40,12 @@ function rpcConfig () {
port: cryptoRec.walletPort || cryptoRec.defaultPort port: cryptoRec.walletPort || cryptoRec.defaultPort
} }
} catch (err) { } catch (err) {
throw new Error('wallet is currently not installed') logger.error('Wallet is currently not installed!')
return {
username: '',
password: '',
port: cryptoRec.walletPort || cryptoRec.defaultPort
}
} }
} }

View file

@ -26,6 +26,9 @@ import { primaryColor } from 'src/styling/variables'
import styles from './Funding.styles' import styles from './Funding.styles'
const NODE_NOT_CONNECTED_ERR =
"Couldn't establish connection with the node. Make sure it is installed and try again"
const useStyles = makeStyles(styles) const useStyles = makeStyles(styles)
const sizes = { const sizes = {
big: 165, big: 165,
@ -176,7 +179,11 @@ const Funding = () => {
{selected && !viewHistory && selected.errorMsg && ( {selected && !viewHistory && selected.errorMsg && (
<div className={classes.main}> <div className={classes.main}>
<div className={classes.firstSide}> <div className={classes.firstSide}>
<Info3 className={classes.error}>{selected.errorMsg}</Info3> <Info3 className={classes.error}>
{R.includes('ECONNREFUSED', selected.errorMsg)
? NODE_NOT_CONNECTED_ERR
: selected.errorMsg}
</Info3>
</div> </div>
</div> </div>
)} )}