diff --git a/lib/service/Service.ts b/lib/service/Service.ts index fa6ea5f1e..8d9f0a3e2 100644 --- a/lib/service/Service.ts +++ b/lib/service/Service.ts @@ -287,7 +287,7 @@ class Service { }); } catch (e) { const errorMessage = e.message || 'unknown'; - throw errors.OPEN_CHANNEL_FAILURE(currency, nodeIdentifier, amount, errorMessage); + throw errors.OPEN_CHANNEL_FAILURE(currency, amount, errorMessage, nodeIdentifier); } } diff --git a/lib/service/errors.ts b/lib/service/errors.ts index 7441bf667..52982bc67 100644 --- a/lib/service/errors.ts +++ b/lib/service/errors.ts @@ -28,10 +28,17 @@ const errors = { message: 'a pending call is ongoing that conflicts with this call', code: errorCodes.PENDING_CALL_CONFLICT, }, - OPEN_CHANNEL_FAILURE: (currency: string, nodePubKey: string, amount: number, message: string) => ({ - message: `failed to open channel with nodePubKey: ${nodePubKey}, currency: ${currency}, amount: ${amount}, message: ${message}`, - code: errorCodes.OPEN_CHANNEL_FAILURE, - }), + OPEN_CHANNEL_FAILURE: (currency: string, amount: number, errorMessage: string, nodeIdentifier?: string) => { + let message = `failed to open ${currency} channel for ${amount}`; + if (nodeIdentifier) { + message += ` with ${nodeIdentifier}`; + } + message += `: ${errorMessage}`; + return { + message, + code: errorCodes.OPEN_CHANNEL_FAILURE, + }; + }, NODE_DOES_NOT_EXIST: { message: 'xud node cannot be unlocked because it does not exist', code: errorCodes.NODE_DOES_NOT_EXIST,