electrum

commit a0acec97203e01d41cc3d203bee893abd5f1d552
parent 409a336071853fd887165b1cf4893de74ae530c2
Author: ThomasV <thomasv@electrum.org>
Date:   Mon, 15 Oct 2018 11:47:42 +0200

gather definitions of LN exceptions

Diffstat:
M
electrum/gui/qt/main_window.py
 | 
1
+
M
electrum/lnutil.py
 | 
21
++++++---------------

2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
@@ -62,6 +62,7 @@ from electrum.util import (format_time, format_satoshis, format_fee_satoshis,
                            UnknownBaseUnit, DECIMAL_POINT_DEFAULT, UserFacingException,
                            get_new_wallet_name, send_exception_to_crash_reporter,
                            InvalidBitcoinURI, InvoiceError)
+from electrum.lnutil import PaymentFailure
 from electrum.transaction import Transaction, TxOutput
 from electrum.address_synchronizer import AddTransactionException
 from electrum.wallet import (Multisig_Wallet, CannotBumpFee, Abstract_Wallet,
diff --git a/electrum/lnutil.py b/electrum/lnutil.py
@@ -57,17 +57,12 @@ class Outpoint(NamedTuple("Outpoint", [('txid', str), ('output_index', int)])):
         return "{}:{}".format(self.txid, self.output_index)
 
 
-class LightningError(Exception):
-    pass
-
-class LightningPeerConnectionClosed(LightningError):
-    pass
-
-class UnableToDeriveSecret(LightningError):
-    pass
-
-class HandshakeFailed(LightningError):
-    pass
+class LightningError(Exception): pass
+class LightningPeerConnectionClosed(LightningError): pass
+class UnableToDeriveSecret(LightningError): pass
+class HandshakeFailed(LightningError): pass
+class PaymentFailure(LightningError): pass
+class ConnStringFormatError(LightningError):  pass
 
 
 class RevocationStore:
@@ -516,8 +511,6 @@ def get_compressed_pubkey_from_bech32(bech32_pubkey: str) -> bytes:
     return bytes(data_8bits)
 
 
-class PaymentFailure(Exception): pass
-
 class HTLCOwner(IntFlag):
     LOCAL = 1
     REMOTE = -LOCAL
@@ -540,8 +533,6 @@ def make_closing_tx(local_funding_pubkey: bytes, remote_funding_pubkey: bytes,
     tx = Transaction.from_io([c_input], outputs, locktime=0, version=2)
     return tx
 
-class ConnStringFormatError(Exception):
-    pass
 
 def split_host_port(host_port: str) -> Tuple[str, str]: # port returned as string
     ipv6  = re.compile(r'\[(?P<host>[:0-9]+)\](?P<port>:\d+)?$')