AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #5765

Browse Source
This commit is contained in:
ThomasV
2019-11-18 05:12:13 +01:00
parent 6b9971a466
commit 47e0b4cd02
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/gui/qt/main_window.py
View File

@@ -1394,10 +1394,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
amount_sat = self.amount_e.get_amount() amount_sat = self.amount_e.get_amount()
attempts = LN_NUM_PAYMENT_ATTEMPTS attempts = LN_NUM_PAYMENT_ATTEMPTS
def task(): def task():
try: self.wallet.lnworker.pay(invoice, amount_sat, attempts)
self.wallet.lnworker.pay(invoice, amount_sat, attempts)
except Exception as e:
self.show_error(str(e))
self.do_clear() self.do_clear()
self.wallet.thread.add(task) self.wallet.thread.add(task)
self.invoice_list.update() self.invoice_list.update()

4
electrum/lnutil.py
View File

@@ -8,7 +8,7 @@ from collections import namedtuple
from typing import NamedTuple, List, Tuple, Mapping, Optional, TYPE_CHECKING, Union, Dict, Set from typing import NamedTuple, List, Tuple, Mapping, Optional, TYPE_CHECKING, Union, Dict, Set
import re import re
from .util import bfh, bh2u, inv_dict from .util import bfh, bh2u, inv_dict, UserFacingException
from .crypto import sha256 from .crypto import sha256
from .transaction import (Transaction, PartialTransaction, PartialTxInput, TxOutpoint, from .transaction import (Transaction, PartialTransaction, PartialTxInput, TxOutpoint,
PartialTxOutput, opcodes, TxOutput) PartialTxOutput, opcodes, TxOutput)
@@ -118,13 +118,13 @@ class LightningError(Exception): pass
class LightningPeerConnectionClosed(LightningError): pass class LightningPeerConnectionClosed(LightningError): pass
class UnableToDeriveSecret(LightningError): pass class UnableToDeriveSecret(LightningError): pass
class HandshakeFailed(LightningError): pass class HandshakeFailed(LightningError): pass
class PaymentFailure(LightningError): pass
class ConnStringFormatError(LightningError): pass class ConnStringFormatError(LightningError): pass
class UnknownPaymentHash(LightningError): pass class UnknownPaymentHash(LightningError): pass
class RemoteMisbehaving(LightningError): pass class RemoteMisbehaving(LightningError): pass
class NotFoundChanAnnouncementForUpdate(Exception): pass class NotFoundChanAnnouncementForUpdate(Exception): pass
class PaymentFailure(UserFacingException): pass
# TODO make some of these values configurable? # TODO make some of these values configurable?
DEFAULT_TO_SELF_DELAY = 144 DEFAULT_TO_SELF_DELAY = 144