diff --git a/gui/kivy/uix/dialogs/lightning_channels.py b/electrum/gui/kivy/uix/dialogs/lightning_channels.py similarity index 98% rename from gui/kivy/uix/dialogs/lightning_channels.py rename to electrum/gui/kivy/uix/dialogs/lightning_channels.py index f562f2903..7de8a221f 100644 --- a/gui/kivy/uix/dialogs/lightning_channels.py +++ b/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(''' diff --git a/gui/kivy/uix/dialogs/lightning_payer.py b/electrum/gui/kivy/uix/dialogs/lightning_payer.py similarity index 98% rename from gui/kivy/uix/dialogs/lightning_payer.py rename to electrum/gui/kivy/uix/dialogs/lightning_payer.py index 9a879d0a8..83a0b6e6e 100644 --- a/gui/kivy/uix/dialogs/lightning_payer.py +++ b/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 diff --git a/gui/qt/channels_list.py b/electrum/gui/qt/channels_list.py similarity index 100% rename from gui/qt/channels_list.py rename to electrum/gui/qt/channels_list.py diff --git a/lib/lightning.json b/electrum/lightning.json similarity index 100% rename from lib/lightning.json rename to electrum/lightning.json diff --git a/lib/lnaddr.py b/electrum/lnaddr.py similarity index 100% rename from lib/lnaddr.py rename to electrum/lnaddr.py diff --git a/lib/lnbase.py b/electrum/lnbase.py similarity index 100% rename from lib/lnbase.py rename to electrum/lnbase.py diff --git a/lib/lnhtlc.py b/electrum/lnhtlc.py similarity index 100% rename from lib/lnhtlc.py rename to electrum/lnhtlc.py diff --git a/lib/lnrouter.py b/electrum/lnrouter.py similarity index 100% rename from lib/lnrouter.py rename to electrum/lnrouter.py diff --git a/lib/lnutil.py b/electrum/lnutil.py similarity index 100% rename from lib/lnutil.py rename to electrum/lnutil.py diff --git a/lib/lnwatcher.py b/electrum/lnwatcher.py similarity index 100% rename from lib/lnwatcher.py rename to electrum/lnwatcher.py diff --git a/lib/lnworker.py b/electrum/lnworker.py similarity index 100% rename from lib/lnworker.py rename to electrum/lnworker.py diff --git a/lib/tests/test_bolt11.py b/electrum/tests/test_bolt11.py similarity index 96% rename from lib/tests/test_bolt11.py rename to electrum/tests/test_bolt11.py index a752563a8..79b981214 100644 --- a/lib/tests/test_bolt11.py +++ b/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 diff --git a/lib/tests/test_lnhtlc.py b/electrum/tests/test_lnhtlc.py similarity index 99% rename from lib/tests/test_lnhtlc.py rename to electrum/tests/test_lnhtlc.py index f81f45297..8d8e646af 100644 --- a/lib/tests/test_lnhtlc.py +++ b/electrum/tests/test_lnhtlc.py @@ -1,11 +1,11 @@ # ported from lnd 42de4400bff5105352d0552155f73589166d162b import unittest -import lib.bitcoin as bitcoin -import lib.lnbase as lnbase -import lib.lnhtlc as lnhtlc -import lib.lnutil as lnutil -import lib.util as util +import electrum.bitcoin as bitcoin +import electrum.lnbase as lnbase +import electrum.lnhtlc as lnhtlc +import electrum.lnutil as lnutil +import electrum.util as util import os import binascii diff --git a/lib/tests/test_lnrouter.py b/electrum/tests/test_lnrouter.py similarity index 98% rename from lib/tests/test_lnrouter.py rename to electrum/tests/test_lnrouter.py index 387702762..af64347bc 100644 --- a/lib/tests/test_lnrouter.py +++ b/electrum/tests/test_lnrouter.py @@ -1,9 +1,9 @@ import unittest -from lib.util import bh2u, bfh -from lib.lnbase import Peer -from lib.lnrouter import OnionHopsDataSingle, new_onion_packet, OnionPerHop -from lib import bitcoin, lnrouter +from electrum.util import bh2u, bfh +from electrum.lnbase import Peer +from electrum.lnrouter import OnionHopsDataSingle, new_onion_packet, OnionPerHop +from electrum import bitcoin, lnrouter class Test_LNRouter(unittest.TestCase): diff --git a/lib/tests/test_lnutil.py b/electrum/tests/test_lnutil.py similarity index 99% rename from lib/tests/test_lnutil.py rename to electrum/tests/test_lnutil.py index b65b018d3..deef133d8 100644 --- a/lib/tests/test_lnutil.py +++ b/electrum/tests/test_lnutil.py @@ -1,12 +1,12 @@ import unittest import json -from lib import bitcoin -from lib.lnutil import (RevocationStore, get_per_commitment_secret_from_seed, make_offered_htlc, +from electrum import bitcoin +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 lib.transaction import Transaction +from electrum.util import bh2u, bfh +from electrum.transaction import Transaction funding_tx_id = '8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be' funding_output_index = 0