replace electrum/ecc with electrum_ecc package

tests/test_bitcoin.py

@@ -4,6 +4,8 @@ import json
 import os
 import sys
 
+import electrum_ecc as ecc
+
 from electrum import bitcoin
 from electrum.bitcoin import (public_key_to_p2pkh, address_from_private_key,
                               is_address, is_private_key,
@@ -23,13 +25,11 @@ from electrum.bip32 import (BIP32Node, convert_bip32_intpath_to_strpath,
                             is_xpub, convert_bip32_strpath_to_intpath,
                             normalize_bip32_derivation, is_all_public_derivation)
 from electrum.crypto import sha256d, SUPPORTED_PW_HASH_VERSIONS
-from electrum import ecc, crypto, constants, bitcoin
+from electrum import crypto, constants, bitcoin
 from electrum.util import bfh, InvalidPassword, randrange
 from electrum.storage import WalletStorage
 from electrum.keystore import xtype_from_derivation
 
-from electrum import ecc_fast, crypto
-
 from . import ElectrumTestCase
 from . import FAST_TESTS
 
@@ -149,7 +149,7 @@ class Test_bitcoin(ElectrumTestCase):
 
     def test_libsecp256k1_is_available(self):
         # we want the unit testing framework to test with libsecp256k1 available.
-        self.assertTrue(bool(ecc_fast._libsecp256k1))
+        self.assertTrue(bool(ecc._libsecp256k1))
 
     def test_pycryptodomex_is_available(self):
         # we want the unit testing framework to test with pycryptodomex available.

tests/test_descriptor.py

@@ -8,6 +8,8 @@
 from binascii import unhexlify
 import unittest
 
+import electrum_ecc as ecc
+
 from electrum.descriptor import (
     parse_descriptor,
     MultisigDescriptor,
@@ -18,7 +20,6 @@ from electrum.descriptor import (
     WSHDescriptor,
     PubkeyProvider,
 )
-from electrum import ecc
 from electrum.util import bfh
 
 from . import ElectrumTestCase, as_testnet

tests/test_ecc.py

@@ -4,9 +4,11 @@ from ctypes import (
 )
 import io
 
-from electrum import ecc, bitcoin
-from electrum.ecc import ECPubkey, ECPrivkey
-from electrum.ecc_fast import _libsecp256k1
+import electrum_ecc as ecc
+from electrum_ecc import ECPubkey, ECPrivkey
+from electrum_ecc import _libsecp256k1
+
+from electrum import bitcoin
 from electrum import crypto
 from electrum.crypto import sha256
 

tests/test_lnpeer.py

@@ -13,6 +13,7 @@ import unittest
 from typing import Iterable, NamedTuple, Tuple, List, Dict
 
 from aiorpcx import timeout_after, TaskTimeout
+from electrum_ecc import ECPrivkey
 
 import electrum
 import electrum.trampoline
@@ -20,7 +21,6 @@ from electrum import bitcoin
 from electrum import util
 from electrum import constants
 from electrum.network import Network
-from electrum.ecc import ECPrivkey
 from electrum import simple_config, lnutil
 from electrum.lnaddr import lnencode, LnAddr, lndecode
 from electrum.bitcoin import COIN, sha256

tests/test_lntransport.py

@@ -1,7 +1,8 @@
 import asyncio
 
+from electrum_ecc import ECPrivkey
+
 from electrum import util
-from electrum.ecc import ECPrivkey
 from electrum.lnutil import LNPeerAddr
 from electrum.lntransport import LNResponderTransport, LNTransport
 from electrum.util import OldTaskGroup

tests/test_lnutil.py

@@ -1,8 +1,9 @@
 import unittest
 import json
 
+import electrum_ecc as ecc
+
 from electrum import bitcoin
-from electrum import ecc
 from electrum.json_db import StoredDict
 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,

tests/test_transaction.py

@@ -2,6 +2,8 @@ import json
 import os
 from typing import NamedTuple, Union
 
+from electrum_ecc import ECPrivkey
+
 from electrum import transaction, bitcoin
 from electrum.transaction import (convert_raw_tx_to_hex, tx_from_any, Transaction,
                                   PartialTransaction, TxOutpoint, PartialTxInput,
@@ -10,7 +12,6 @@ from electrum.transaction import (convert_raw_tx_to_hex, tx_from_any, Transactio
 from electrum.util import bfh
 from electrum.bitcoin import (deserialize_privkey, opcodes,
                               construct_script, construct_witness)
-from electrum.ecc import ECPrivkey
 from electrum import descriptor
 
 from .test_bitcoin import disable_ecdsa_r_value_grinding