AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up d8352f1a0a

Browse Source 
message-induced exceptions should not propagate out
This commit is contained in:
SomberNight
2021-03-19 21:21:09 +01:00
parent c912036180
commit 65e16fabd2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/lnonion.py
View File

@@ -33,7 +33,8 @@ from .crypto import sha256, hmac_oneshot, chacha20_encrypt
from .util import bh2u, profiler, xor_bytes, bfh from .util import bh2u, profiler, xor_bytes, bfh
from .lnutil import (get_ecdh, PaymentFailure, NUM_MAX_HOPS_IN_PAYMENT_PATH, from .lnutil import (get_ecdh, PaymentFailure, NUM_MAX_HOPS_IN_PAYMENT_PATH,
NUM_MAX_EDGES_IN_PAYMENT_PATH, ShortChannelID, OnionFailureCodeMetaFlag) NUM_MAX_EDGES_IN_PAYMENT_PATH, ShortChannelID, OnionFailureCodeMetaFlag)
from .lnmsg import OnionWireSerializer, read_bigsize_int, write_bigsize_int, UnknownMsgType from .lnmsg import OnionWireSerializer, read_bigsize_int, write_bigsize_int
from . import lnmsg
if TYPE_CHECKING: if TYPE_CHECKING:
from .lnrouter import LNPaymentRoute from .lnrouter import LNPaymentRoute
@@ -443,7 +444,7 @@ class OnionRoutingFailure(Exception):
def decode_data(self) -> Optional[Dict[str, Any]]: def decode_data(self) -> Optional[Dict[str, Any]]:
try: try:
message_type, payload = OnionWireSerializer.decode_msg(self.to_bytes()) message_type, payload = OnionWireSerializer.decode_msg(self.to_bytes())
except UnknownMsgType: except lnmsg.FailedToParseMsg:
payload = None payload = None
return payload return payload