lightning: fixup after rebasing on restructured master

electrum/gui/kivy/uix/dialogs/lightning_channels.py

@@ -3,7 +3,7 @@ from kivy.lang import Builder
 from kivy.factory import Factory
 from kivy.uix.popup import Popup
 from kivy.clock import Clock
-from electrum_gui.kivy.uix.context_menu import ContextMenu
+from electrum.gui.kivy.uix.context_menu import ContextMenu
 
 Builder.load_string('''
 <LightningChannelItem@CardItem>

electrum/gui/kivy/uix/dialogs/lightning_payer.py

@@ -1,7 +1,7 @@
 import binascii
 from kivy.lang import Builder
 from kivy.factory import Factory
-from electrum_gui.kivy.i18n import _
+from electrum.gui.kivy.i18n import _
 from kivy.clock import mainthread
 from electrum.lnaddr import lndecode
 

electrum/tests/test_bolt11.py

@@ -1,8 +1,8 @@
 from hashlib import sha256
-from lib.lnaddr import shorten_amount, unshorten_amount, LnAddr, lnencode, lndecode, u5_to_bitarray, bitarray_to_u5
+from electrum.lnaddr import shorten_amount, unshorten_amount, LnAddr, lnencode, lndecode, u5_to_bitarray, bitarray_to_u5
 from decimal import Decimal
 from binascii import unhexlify, hexlify
-from lib.segwit_addr import bech32_encode, bech32_decode
+from electrum.segwit_addr import bech32_encode, bech32_decode
 import pprint
 import unittest
 

electrum/tests/test_lnhtlc.py

@@ -1,11 +1,11 @@
 # ported from lnd 42de4400bff5105352d0552155f73589166d162b
 
 import unittest
-import lib.bitcoin as bitcoin
+import electrum.bitcoin as bitcoin
-import lib.lnbase as lnbase
+import electrum.lnbase as lnbase
-import lib.lnhtlc as lnhtlc
+import electrum.lnhtlc as lnhtlc
-import lib.lnutil as lnutil
+import electrum.lnutil as lnutil
-import lib.util as util
+import electrum.util as util
 import os
 import binascii
 

electrum/tests/test_lnrouter.py

@@ -1,9 +1,9 @@
 import unittest
 
-from lib.util import bh2u, bfh
+from electrum.util import bh2u, bfh
-from lib.lnbase import Peer
+from electrum.lnbase import Peer
-from lib.lnrouter import OnionHopsDataSingle, new_onion_packet, OnionPerHop
+from electrum.lnrouter import OnionHopsDataSingle, new_onion_packet, OnionPerHop
-from lib import bitcoin, lnrouter
+from electrum import bitcoin, lnrouter
 
 class Test_LNRouter(unittest.TestCase):
 

electrum/tests/test_lnutil.py

@@ -1,12 +1,12 @@
 import unittest
 import json
-from lib import bitcoin
+from electrum import bitcoin
-from lib.lnutil import (RevocationStore, get_per_commitment_secret_from_seed, make_offered_htlc,
+from electrum.lnutil import (RevocationStore, get_per_commitment_secret_from_seed, make_offered_htlc,
                         make_received_htlc, make_commitment, make_htlc_tx_witness, make_htlc_tx_output,
                         make_htlc_tx_inputs, secret_to_pubkey, derive_blinded_pubkey, derive_privkey,
                         derive_pubkey, make_htlc_tx, extract_ctn_from_tx, UnableToDeriveSecret)
-from lib.util import bh2u, bfh
+from electrum.util import bh2u, bfh
-from lib.transaction import Transaction
+from electrum.transaction import Transaction
 
 funding_tx_id = '8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be'
 funding_output_index = 0