AaronFiore/electrum
1
0
Fork 0
Code Activity

lnutil.PaymentAttemptLog: fix error formatting

Browse Source 
fixes #6249
This commit is contained in:
SomberNight
2020-06-22 03:40:04 +02:00
parent b6db201570
commit 89ddc1345d
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/lnonion.py
View File

@@ -405,6 +405,11 @@ class OnionRoutingFailureMessage:
failure_data = failure_msg[2:] failure_data = failure_msg[2:]
return OnionRoutingFailureMessage(failure_code, failure_data) return OnionRoutingFailureMessage(failure_code, failure_data)
def code_name(self) -> str:
if isinstance(self.code, OnionFailureCode):
return str(self.code.name)
return f"Unknown error ({self.code!r})"
def construct_onion_error(reason: OnionRoutingFailureMessage, def construct_onion_error(reason: OnionRoutingFailureMessage,
onion_packet: OnionPacket, onion_packet: OnionPacket,

8
electrum/lnutil.py
View File

@@ -269,8 +269,12 @@ class PaymentAttemptLog(NamedTuple):
sender_idx = self.failure_details.sender_idx sender_idx = self.failure_details.sender_idx
failure_msg = self.failure_details.failure_msg failure_msg = self.failure_details.failure_msg
if sender_idx is not None: if sender_idx is not None:
short_channel_id = route[sender_idx+1].short_channel_id try:
message = str(failure_msg.code.name) short_channel_id = route[sender_idx + 1].short_channel_id
except IndexError:
# payment destination reported error
short_channel_id = _("Destination node")
message = failure_msg.code_name()
else: else:
short_channel_id = route[-1].short_channel_id short_channel_id = route[-1].short_channel_id
message = _('Success') message = _('Success')