commit 8346e358b292e7a1dc387f7a9337b2d1fc347d8b
parent 4515c859c4c2e62f1c6ca4a51d4494afde870f2c
Author: ThomasV <thomasv@electrum.org>
Date: Fri, 29 Jun 2018 12:33:16 +0200
move lnaddr.py to lib
Diffstat:
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
@@ -1881,7 +1881,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
self.payment_request_error_signal.emit()
def parse_lightning_invoice(self, invoice):
- from electrum.lightning_payencode.lnaddr import lndecode
+ from electrum.lnaddr import lndecode
lnaddr = lndecode(invoice, expected_hrp=constants.net.SEGWIT_HRP)
pubkey = bh2u(lnaddr.pubkey.serialize())
for k,v in lnaddr.tags:
diff --git a/electrum/gui/qt/request_list.py b/electrum/gui/qt/request_list.py
@@ -152,7 +152,7 @@ class RequestList(MyTreeView):
self.filter()
# lightning
for payreq_key, r in self.wallet.lnworker.invoices.items():
- from electrum.lightning_payencode.lnaddr import lndecode
+ from electrum.lnaddr import lndecode
import electrum.constants as constants
lnaddr = lndecode(r, expected_hrp=constants.net.SEGWIT_HRP)
amount_sat = lnaddr.amount*COIN if lnaddr.amount else None
diff --git a/gui/kivy/uix/dialogs/lightning_payer.py b/gui/kivy/uix/dialogs/lightning_payer.py
@@ -3,7 +3,7 @@ from kivy.lang import Builder
from kivy.factory import Factory
from electrum_gui.kivy.i18n import _
from kivy.clock import mainthread
-from electrum.lightning_payencode.lnaddr import lndecode
+from electrum.lnaddr import lndecode
Builder.load_string('''
<LightningPayerDialog@Popup>
diff --git a/lib/lightning_payencode/lnaddr.py b/lib/lnaddr.py
diff --git a/lib/lnbase.py b/lib/lnbase.py
@@ -32,7 +32,7 @@ from . import transaction
from .util import PrintError, bh2u, print_error, bfh, profiler, xor_bytes
from .transaction import opcodes, Transaction
from .lnrouter import new_onion_packet, OnionHopsDataSingle, OnionPerHop, decode_onion_error
-from .lightning_payencode.lnaddr import lndecode
+from .lnaddr import lndecode
from .lnhtlc import UpdateAddHtlc, HTLCStateMachine, RevokeAndAck, SettleHtlc
REV_GENESIS = bytes.fromhex(bitcoin.rev_hex(constants.net.GENESIS))
diff --git a/lib/lnworker.py b/lib/lnworker.py
@@ -11,7 +11,7 @@ from .bitcoin import sha256, COIN
from .util import bh2u, bfh, PrintError
from .constants import set_testnet, set_simnet
from .lnbase import Peer, privkey_to_pubkey
-from .lightning_payencode.lnaddr import lnencode, LnAddr, lndecode
+from .lnaddr import lnencode, LnAddr, lndecode
from .ecc import der_sig_from_sig_string
from .transaction import Transaction
from .lnhtlc import HTLCStateMachine
