fixes after rebase

spesmilo · Oct 23, 2024 · 7c70ce3 · 7c70ce3
1 parent 99419cf
commit 7c70ce3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/electrum/onion_message.py b/electrum/onion_message.py
@@ -29,15 +29,16 @@
 
 from typing import TYPE_CHECKING, Optional, List, Sequence
 
-from electrum import ecc
+import electrum_ecc as ecc
+
 from electrum.lnrouter import PathEdge
 from electrum.logging import get_logger, Logger
-from electrum.crypto import sha256
+from electrum.crypto import sha256, get_ecdh
 from electrum.lnmsg import OnionWireSerializer
 from electrum.lnonion import (get_shared_secrets_along_route2, get_bolt04_onion_key, OnionPacket, process_onion_packet,
                               OnionHopsDataSingle, decrypt_encrypted_data_tlv, encrypt_encrypted_data_tlv,
                               get_shared_secrets_along_route, new_onion_packet)
-from electrum.lnutil import get_ecdh, LnFeatures
+from electrum.lnutil import LnFeatures
 from electrum.util import OldTaskGroup, now
 
 if TYPE_CHECKING:

diff --git a/tests/test_onion_message.py b/tests/test_onion_message.py
@@ -1,12 +1,12 @@
 import io
 
-from electrum import ecc
+import electrum_ecc as ecc
 from electrum.lnmsg import decode_msg, OnionWireSerializer
 from electrum.lnonion import (get_shared_secrets_along_route2, OnionHopsDataSingle, OnionPacket,
                               process_onion_packet, get_bolt04_onion_key, encrypt_encrypted_data_tlv,
                               get_shared_secrets_along_route, new_onion_packet, ONION_MESSAGE_LARGE_SIZE,
                               HOPS_DATA_SIZE, InvalidPayloadSize)
-from electrum.lnutil import get_ecdh
+from electrum.crypto import get_ecdh
 from electrum.onion_message import blinding_privkey, create_blinded_path, encrypt_onionmsg_tlv_hops_data
 from electrum.util import bfh