From 73fee69f5c20c19c820c219719e9ae5d05409e64 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Fri, 16 Feb 2024 15:33:34 +0100 Subject: [PATCH] tests: move /electrum/tests to /tests --- {electrum/tests => tests}/__init__.py | 0 {electrum/tests => tests}/qt_util.py | 0 {electrum/tests => tests}/regtest.py | 2 +- {electrum/tests => tests}/regtest/regtest.sh | 0 {electrum/tests => tests}/regtest/run_bitcoind.sh | 0 {electrum/tests => tests}/regtest/run_electrumx.sh | 0 {electrum/tests => tests}/slip39-vectors.json | 0 {electrum/tests => tests}/test_bitcoin.py | 0 {electrum/tests => tests}/test_blockchain.py | 0 {electrum/tests => tests}/test_bolt11.py | 0 {electrum/tests => tests}/test_coinchooser.py | 0 {electrum/tests => tests}/test_commands.py | 0 {electrum/tests => tests}/test_contacts.py | 0 {electrum/tests => tests}/test_daemon.py | 0 {electrum/tests => tests}/test_descriptor.py | 0 {electrum/tests => tests}/test_interface.py | 0 {electrum/tests => tests}/test_invoices.py | 0 {electrum/tests => tests}/test_lnchannel.py | 0 {electrum/tests => tests}/test_lnhtlc.py | 0 {electrum/tests => tests}/test_lnmsg.py | 0 {electrum/tests => tests}/test_lnpeer.py | 0 {electrum/tests => tests}/test_lnrouter.py | 0 {electrum/tests => tests}/test_lntransport.py | 0 {electrum/tests => tests}/test_lnurl.py | 0 {electrum/tests => tests}/test_lnutil.py | 0 {electrum/tests => tests}/test_mnemonic.py | 0 {electrum/tests => tests}/test_mpp_split.py | 0 {electrum/tests => tests}/test_network.py | 0 {electrum/tests => tests}/test_payment_identifier.py | 2 +- {electrum/tests => tests}/test_psbt.py | 0 {electrum/tests => tests}/test_qml_types.py | 2 +- {electrum/tests => tests}/test_revealer.py | 0 {electrum/tests => tests}/test_simple_config.py | 0 {electrum/tests => tests}/test_sswaps.py | 0 {electrum/tests => tests}/test_storage_upgrade.py | 0 .../tests => tests}/test_storage_upgrade/client_1_9_8_seeded | 0 .../test_storage_upgrade/client_2_0_4_importedkeys | 0 .../test_storage_upgrade/client_2_0_4_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_0_4_seeded | 0 .../test_storage_upgrade/client_2_0_4_trezor_multiacc | 0 .../test_storage_upgrade/client_2_0_4_trezor_singleacc | 0 .../test_storage_upgrade/client_2_0_4_watchaddresses | 0 .../test_storage_upgrade/client_2_1_1_importedkeys | 0 .../test_storage_upgrade/client_2_1_1_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_1_1_seeded | 0 .../test_storage_upgrade/client_2_1_1_trezor_multiacc | 0 .../test_storage_upgrade/client_2_1_1_trezor_singleacc | 0 .../test_storage_upgrade/client_2_1_1_watchaddresses | 0 .../test_storage_upgrade/client_2_2_0_importedkeys | 0 .../test_storage_upgrade/client_2_2_0_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_2_0_seeded | 0 .../test_storage_upgrade/client_2_2_0_trezor_multiacc | 0 .../test_storage_upgrade/client_2_2_0_trezor_singleacc | 0 .../test_storage_upgrade/client_2_2_0_watchaddresses | 0 .../test_storage_upgrade/client_2_3_2_importedkeys | 0 .../test_storage_upgrade/client_2_3_2_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_3_2_seeded | 0 .../test_storage_upgrade/client_2_3_2_trezor_multiacc | 0 .../test_storage_upgrade/client_2_3_2_trezor_singleacc | 0 .../test_storage_upgrade/client_2_3_2_watchaddresses | 0 .../test_storage_upgrade/client_2_4_3_importedkeys | 0 .../test_storage_upgrade/client_2_4_3_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_4_3_seeded | 0 .../test_storage_upgrade/client_2_4_3_trezor_multiacc | 0 .../test_storage_upgrade/client_2_4_3_trezor_singleacc | 0 .../test_storage_upgrade/client_2_4_3_watchaddresses | 0 .../test_storage_upgrade/client_2_5_4_importedkeys | 0 .../test_storage_upgrade/client_2_5_4_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_5_4_seeded | 0 .../test_storage_upgrade/client_2_5_4_trezor_multiacc | 0 .../test_storage_upgrade/client_2_5_4_trezor_singleacc | 0 .../test_storage_upgrade/client_2_5_4_watchaddresses | 0 .../test_storage_upgrade/client_2_6_4_importedkeys | 0 .../test_storage_upgrade/client_2_6_4_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_6_4_seeded | 0 .../test_storage_upgrade/client_2_6_4_watchaddresses | 0 .../test_storage_upgrade/client_2_7_18_importedkeys | 0 .../test_storage_upgrade/client_2_7_18_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_7_18_seeded | 0 .../test_storage_upgrade/client_2_7_18_trezor_singleacc | 0 .../test_storage_upgrade/client_2_7_18_watchaddresses | 0 .../test_storage_upgrade/client_2_8_3_importedkeys | 0 ...ent_2_8_3_importedkeys_flawed_previous_upgrade_from_2_7_18 | 0 .../test_storage_upgrade/client_2_8_3_multisig | 0 .../tests => tests}/test_storage_upgrade/client_2_8_3_seeded | 0 .../test_storage_upgrade/client_2_8_3_trezor_singleacc | 0 .../test_storage_upgrade/client_2_8_3_watchaddresses | 0 .../test_storage_upgrade/client_2_9_3_importedkeys | 0 .../client_2_9_3_importedkeys_keystore_changes | 0 .../test_storage_upgrade/client_2_9_3_multisig | 0 .../client_2_9_3_old_seeded_with_realistic_history | 0 .../tests => tests}/test_storage_upgrade/client_2_9_3_seeded | 0 .../test_storage_upgrade/client_2_9_3_trezor_singleacc | 0 .../test_storage_upgrade/client_2_9_3_watchaddresses | 0 .../client_3_2_3_ledger_standard_keystore_changes | 0 .../client_3_3_8_xpub_with_realistic_history | 0 {electrum/tests => tests}/test_transaction.py | 0 {electrum/tests => tests}/test_util.py | 0 {electrum/tests => tests}/test_verifier.py | 0 {electrum/tests => tests}/test_wallet.py | 0 {electrum/tests => tests}/test_wallet_vertical.py | 0 {electrum/tests => tests}/test_x509.py | 0 tox.ini | 4 ++-- 103 files changed, 5 insertions(+), 5 deletions(-) rename {electrum/tests => tests}/__init__.py (100%) rename {electrum/tests => tests}/qt_util.py (100%) rename {electrum/tests => tests}/regtest.py (96%) rename {electrum/tests => tests}/regtest/regtest.sh (100%) rename {electrum/tests => tests}/regtest/run_bitcoind.sh (100%) rename {electrum/tests => tests}/regtest/run_electrumx.sh (100%) rename {electrum/tests => tests}/slip39-vectors.json (100%) rename {electrum/tests => tests}/test_bitcoin.py (100%) rename {electrum/tests => tests}/test_blockchain.py (100%) rename {electrum/tests => tests}/test_bolt11.py (100%) rename {electrum/tests => tests}/test_coinchooser.py (100%) rename {electrum/tests => tests}/test_commands.py (100%) rename {electrum/tests => tests}/test_contacts.py (100%) rename {electrum/tests => tests}/test_daemon.py (100%) rename {electrum/tests => tests}/test_descriptor.py (100%) rename {electrum/tests => tests}/test_interface.py (100%) rename {electrum/tests => tests}/test_invoices.py (100%) rename {electrum/tests => tests}/test_lnchannel.py (100%) rename {electrum/tests => tests}/test_lnhtlc.py (100%) rename {electrum/tests => tests}/test_lnmsg.py (100%) rename {electrum/tests => tests}/test_lnpeer.py (100%) rename {electrum/tests => tests}/test_lnrouter.py (100%) rename {electrum/tests => tests}/test_lntransport.py (100%) rename {electrum/tests => tests}/test_lnurl.py (100%) rename {electrum/tests => tests}/test_lnutil.py (100%) rename {electrum/tests => tests}/test_mnemonic.py (100%) rename {electrum/tests => tests}/test_mpp_split.py (100%) rename {electrum/tests => tests}/test_network.py (100%) rename {electrum/tests => tests}/test_payment_identifier.py (99%) rename {electrum/tests => tests}/test_psbt.py (100%) rename {electrum/tests => tests}/test_qml_types.py (98%) rename {electrum/tests => tests}/test_revealer.py (100%) rename {electrum/tests => tests}/test_simple_config.py (100%) rename {electrum/tests => tests}/test_sswaps.py (100%) rename {electrum/tests => tests}/test_storage_upgrade.py (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_1_9_8_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_0_4_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_0_4_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_0_4_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_0_4_trezor_multiacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_0_4_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_0_4_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_1_1_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_1_1_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_1_1_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_1_1_trezor_multiacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_1_1_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_1_1_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_2_0_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_2_0_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_2_0_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_2_0_trezor_multiacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_2_0_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_2_0_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_3_2_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_3_2_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_3_2_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_3_2_trezor_multiacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_3_2_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_3_2_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_4_3_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_4_3_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_4_3_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_4_3_trezor_multiacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_4_3_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_4_3_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_5_4_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_5_4_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_5_4_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_5_4_trezor_multiacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_5_4_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_5_4_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_6_4_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_6_4_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_6_4_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_6_4_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_7_18_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_7_18_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_7_18_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_7_18_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_7_18_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_8_3_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_8_3_importedkeys_flawed_previous_upgrade_from_2_7_18 (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_8_3_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_8_3_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_8_3_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_8_3_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_9_3_importedkeys (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_9_3_importedkeys_keystore_changes (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_9_3_multisig (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_9_3_old_seeded_with_realistic_history (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_9_3_seeded (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_9_3_trezor_singleacc (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_2_9_3_watchaddresses (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_3_2_3_ledger_standard_keystore_changes (100%) rename {electrum/tests => tests}/test_storage_upgrade/client_3_3_8_xpub_with_realistic_history (100%) rename {electrum/tests => tests}/test_transaction.py (100%) rename {electrum/tests => tests}/test_util.py (100%) rename {electrum/tests => tests}/test_verifier.py (100%) rename {electrum/tests => tests}/test_wallet.py (100%) rename {electrum/tests => tests}/test_wallet_vertical.py (100%) rename {electrum/tests => tests}/test_x509.py (100%) diff --git a/electrum/tests/__init__.py b/tests/__init__.py similarity index 100% rename from electrum/tests/__init__.py rename to tests/__init__.py diff --git a/electrum/tests/qt_util.py b/tests/qt_util.py similarity index 100% rename from electrum/tests/qt_util.py rename to tests/qt_util.py diff --git a/electrum/tests/regtest.py b/tests/regtest.py similarity index 96% rename from electrum/tests/regtest.py rename to tests/regtest.py index 2c66a6888..280637d76 100644 --- a/electrum/tests/regtest.py +++ b/tests/regtest.py @@ -7,7 +7,7 @@ class TestLightning(unittest.TestCase): @staticmethod def run_shell(args, timeout=30): - process = subprocess.Popen(['electrum/tests/regtest/regtest.sh'] + args, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, universal_newlines=True) + process = subprocess.Popen(['tests/regtest/regtest.sh'] + args, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, universal_newlines=True) for line in iter(process.stdout.readline, ''): sys.stdout.write(line) sys.stdout.flush() diff --git a/electrum/tests/regtest/regtest.sh b/tests/regtest/regtest.sh similarity index 100% rename from electrum/tests/regtest/regtest.sh rename to tests/regtest/regtest.sh diff --git a/electrum/tests/regtest/run_bitcoind.sh b/tests/regtest/run_bitcoind.sh similarity index 100% rename from electrum/tests/regtest/run_bitcoind.sh rename to tests/regtest/run_bitcoind.sh diff --git a/electrum/tests/regtest/run_electrumx.sh b/tests/regtest/run_electrumx.sh similarity index 100% rename from electrum/tests/regtest/run_electrumx.sh rename to tests/regtest/run_electrumx.sh diff --git a/electrum/tests/slip39-vectors.json b/tests/slip39-vectors.json similarity index 100% rename from electrum/tests/slip39-vectors.json rename to tests/slip39-vectors.json diff --git a/electrum/tests/test_bitcoin.py b/tests/test_bitcoin.py similarity index 100% rename from electrum/tests/test_bitcoin.py rename to tests/test_bitcoin.py diff --git a/electrum/tests/test_blockchain.py b/tests/test_blockchain.py similarity index 100% rename from electrum/tests/test_blockchain.py rename to tests/test_blockchain.py diff --git a/electrum/tests/test_bolt11.py b/tests/test_bolt11.py similarity index 100% rename from electrum/tests/test_bolt11.py rename to tests/test_bolt11.py diff --git a/electrum/tests/test_coinchooser.py b/tests/test_coinchooser.py similarity index 100% rename from electrum/tests/test_coinchooser.py rename to tests/test_coinchooser.py diff --git a/electrum/tests/test_commands.py b/tests/test_commands.py similarity index 100% rename from electrum/tests/test_commands.py rename to tests/test_commands.py diff --git a/electrum/tests/test_contacts.py b/tests/test_contacts.py similarity index 100% rename from electrum/tests/test_contacts.py rename to tests/test_contacts.py diff --git a/electrum/tests/test_daemon.py b/tests/test_daemon.py similarity index 100% rename from electrum/tests/test_daemon.py rename to tests/test_daemon.py diff --git a/electrum/tests/test_descriptor.py b/tests/test_descriptor.py similarity index 100% rename from electrum/tests/test_descriptor.py rename to tests/test_descriptor.py diff --git a/electrum/tests/test_interface.py b/tests/test_interface.py similarity index 100% rename from electrum/tests/test_interface.py rename to tests/test_interface.py diff --git a/electrum/tests/test_invoices.py b/tests/test_invoices.py similarity index 100% rename from electrum/tests/test_invoices.py rename to tests/test_invoices.py diff --git a/electrum/tests/test_lnchannel.py b/tests/test_lnchannel.py similarity index 100% rename from electrum/tests/test_lnchannel.py rename to tests/test_lnchannel.py diff --git a/electrum/tests/test_lnhtlc.py b/tests/test_lnhtlc.py similarity index 100% rename from electrum/tests/test_lnhtlc.py rename to tests/test_lnhtlc.py diff --git a/electrum/tests/test_lnmsg.py b/tests/test_lnmsg.py similarity index 100% rename from electrum/tests/test_lnmsg.py rename to tests/test_lnmsg.py diff --git a/electrum/tests/test_lnpeer.py b/tests/test_lnpeer.py similarity index 100% rename from electrum/tests/test_lnpeer.py rename to tests/test_lnpeer.py diff --git a/electrum/tests/test_lnrouter.py b/tests/test_lnrouter.py similarity index 100% rename from electrum/tests/test_lnrouter.py rename to tests/test_lnrouter.py diff --git a/electrum/tests/test_lntransport.py b/tests/test_lntransport.py similarity index 100% rename from electrum/tests/test_lntransport.py rename to tests/test_lntransport.py diff --git a/electrum/tests/test_lnurl.py b/tests/test_lnurl.py similarity index 100% rename from electrum/tests/test_lnurl.py rename to tests/test_lnurl.py diff --git a/electrum/tests/test_lnutil.py b/tests/test_lnutil.py similarity index 100% rename from electrum/tests/test_lnutil.py rename to tests/test_lnutil.py diff --git a/electrum/tests/test_mnemonic.py b/tests/test_mnemonic.py similarity index 100% rename from electrum/tests/test_mnemonic.py rename to tests/test_mnemonic.py diff --git a/electrum/tests/test_mpp_split.py b/tests/test_mpp_split.py similarity index 100% rename from electrum/tests/test_mpp_split.py rename to tests/test_mpp_split.py diff --git a/electrum/tests/test_network.py b/tests/test_network.py similarity index 100% rename from electrum/tests/test_network.py rename to tests/test_network.py diff --git a/electrum/tests/test_payment_identifier.py b/tests/test_payment_identifier.py similarity index 99% rename from electrum/tests/test_payment_identifier.py rename to tests/test_payment_identifier.py index 710199396..a5a64c85c 100644 --- a/electrum/tests/test_payment_identifier.py +++ b/tests/test_payment_identifier.py @@ -3,7 +3,7 @@ from electrum.payment_identifier import (maybe_extract_lightning_payment_identif PaymentIdentifierType) from . import ElectrumTestCase -from ..transaction import PartialTxOutput +from electrum.transaction import PartialTxOutput class WalletMock: diff --git a/electrum/tests/test_psbt.py b/tests/test_psbt.py similarity index 100% rename from electrum/tests/test_psbt.py rename to tests/test_psbt.py diff --git a/electrum/tests/test_qml_types.py b/tests/test_qml_types.py similarity index 98% rename from electrum/tests/test_qml_types.py rename to tests/test_qml_types.py index 6200fd1e2..30f6df8d5 100644 --- a/electrum/tests/test_qml_types.py +++ b/tests/test_qml_types.py @@ -4,7 +4,7 @@ import tempfile from electrum import SimpleConfig from electrum.gui.qml.qetypes import QEAmount from electrum.invoices import Invoice, LN_EXPIRY_NEVER -from electrum.tests.qt_util import QETestCase, QEventReceiver, qt_test +from tests.qt_util import QETestCase, QEventReceiver, qt_test from electrum.transaction import PartialTxOutput diff --git a/electrum/tests/test_revealer.py b/tests/test_revealer.py similarity index 100% rename from electrum/tests/test_revealer.py rename to tests/test_revealer.py diff --git a/electrum/tests/test_simple_config.py b/tests/test_simple_config.py similarity index 100% rename from electrum/tests/test_simple_config.py rename to tests/test_simple_config.py diff --git a/electrum/tests/test_sswaps.py b/tests/test_sswaps.py similarity index 100% rename from electrum/tests/test_sswaps.py rename to tests/test_sswaps.py diff --git a/electrum/tests/test_storage_upgrade.py b/tests/test_storage_upgrade.py similarity index 100% rename from electrum/tests/test_storage_upgrade.py rename to tests/test_storage_upgrade.py diff --git a/electrum/tests/test_storage_upgrade/client_1_9_8_seeded b/tests/test_storage_upgrade/client_1_9_8_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_1_9_8_seeded rename to tests/test_storage_upgrade/client_1_9_8_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_0_4_importedkeys b/tests/test_storage_upgrade/client_2_0_4_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_0_4_importedkeys rename to tests/test_storage_upgrade/client_2_0_4_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_0_4_multisig b/tests/test_storage_upgrade/client_2_0_4_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_0_4_multisig rename to tests/test_storage_upgrade/client_2_0_4_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_0_4_seeded b/tests/test_storage_upgrade/client_2_0_4_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_0_4_seeded rename to tests/test_storage_upgrade/client_2_0_4_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_0_4_trezor_multiacc b/tests/test_storage_upgrade/client_2_0_4_trezor_multiacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_0_4_trezor_multiacc rename to tests/test_storage_upgrade/client_2_0_4_trezor_multiacc diff --git a/electrum/tests/test_storage_upgrade/client_2_0_4_trezor_singleacc b/tests/test_storage_upgrade/client_2_0_4_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_0_4_trezor_singleacc rename to tests/test_storage_upgrade/client_2_0_4_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_0_4_watchaddresses b/tests/test_storage_upgrade/client_2_0_4_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_0_4_watchaddresses rename to tests/test_storage_upgrade/client_2_0_4_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_1_1_importedkeys b/tests/test_storage_upgrade/client_2_1_1_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_1_1_importedkeys rename to tests/test_storage_upgrade/client_2_1_1_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_1_1_multisig b/tests/test_storage_upgrade/client_2_1_1_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_1_1_multisig rename to tests/test_storage_upgrade/client_2_1_1_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_1_1_seeded b/tests/test_storage_upgrade/client_2_1_1_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_1_1_seeded rename to tests/test_storage_upgrade/client_2_1_1_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_1_1_trezor_multiacc b/tests/test_storage_upgrade/client_2_1_1_trezor_multiacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_1_1_trezor_multiacc rename to tests/test_storage_upgrade/client_2_1_1_trezor_multiacc diff --git a/electrum/tests/test_storage_upgrade/client_2_1_1_trezor_singleacc b/tests/test_storage_upgrade/client_2_1_1_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_1_1_trezor_singleacc rename to tests/test_storage_upgrade/client_2_1_1_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_1_1_watchaddresses b/tests/test_storage_upgrade/client_2_1_1_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_1_1_watchaddresses rename to tests/test_storage_upgrade/client_2_1_1_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_2_0_importedkeys b/tests/test_storage_upgrade/client_2_2_0_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_2_0_importedkeys rename to tests/test_storage_upgrade/client_2_2_0_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_2_0_multisig b/tests/test_storage_upgrade/client_2_2_0_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_2_0_multisig rename to tests/test_storage_upgrade/client_2_2_0_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_2_0_seeded b/tests/test_storage_upgrade/client_2_2_0_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_2_0_seeded rename to tests/test_storage_upgrade/client_2_2_0_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_2_0_trezor_multiacc b/tests/test_storage_upgrade/client_2_2_0_trezor_multiacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_2_0_trezor_multiacc rename to tests/test_storage_upgrade/client_2_2_0_trezor_multiacc diff --git a/electrum/tests/test_storage_upgrade/client_2_2_0_trezor_singleacc b/tests/test_storage_upgrade/client_2_2_0_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_2_0_trezor_singleacc rename to tests/test_storage_upgrade/client_2_2_0_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_2_0_watchaddresses b/tests/test_storage_upgrade/client_2_2_0_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_2_0_watchaddresses rename to tests/test_storage_upgrade/client_2_2_0_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_3_2_importedkeys b/tests/test_storage_upgrade/client_2_3_2_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_3_2_importedkeys rename to tests/test_storage_upgrade/client_2_3_2_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_3_2_multisig b/tests/test_storage_upgrade/client_2_3_2_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_3_2_multisig rename to tests/test_storage_upgrade/client_2_3_2_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_3_2_seeded b/tests/test_storage_upgrade/client_2_3_2_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_3_2_seeded rename to tests/test_storage_upgrade/client_2_3_2_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_3_2_trezor_multiacc b/tests/test_storage_upgrade/client_2_3_2_trezor_multiacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_3_2_trezor_multiacc rename to tests/test_storage_upgrade/client_2_3_2_trezor_multiacc diff --git a/electrum/tests/test_storage_upgrade/client_2_3_2_trezor_singleacc b/tests/test_storage_upgrade/client_2_3_2_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_3_2_trezor_singleacc rename to tests/test_storage_upgrade/client_2_3_2_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_3_2_watchaddresses b/tests/test_storage_upgrade/client_2_3_2_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_3_2_watchaddresses rename to tests/test_storage_upgrade/client_2_3_2_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_4_3_importedkeys b/tests/test_storage_upgrade/client_2_4_3_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_4_3_importedkeys rename to tests/test_storage_upgrade/client_2_4_3_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_4_3_multisig b/tests/test_storage_upgrade/client_2_4_3_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_4_3_multisig rename to tests/test_storage_upgrade/client_2_4_3_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_4_3_seeded b/tests/test_storage_upgrade/client_2_4_3_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_4_3_seeded rename to tests/test_storage_upgrade/client_2_4_3_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_4_3_trezor_multiacc b/tests/test_storage_upgrade/client_2_4_3_trezor_multiacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_4_3_trezor_multiacc rename to tests/test_storage_upgrade/client_2_4_3_trezor_multiacc diff --git a/electrum/tests/test_storage_upgrade/client_2_4_3_trezor_singleacc b/tests/test_storage_upgrade/client_2_4_3_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_4_3_trezor_singleacc rename to tests/test_storage_upgrade/client_2_4_3_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_4_3_watchaddresses b/tests/test_storage_upgrade/client_2_4_3_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_4_3_watchaddresses rename to tests/test_storage_upgrade/client_2_4_3_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_5_4_importedkeys b/tests/test_storage_upgrade/client_2_5_4_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_5_4_importedkeys rename to tests/test_storage_upgrade/client_2_5_4_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_5_4_multisig b/tests/test_storage_upgrade/client_2_5_4_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_5_4_multisig rename to tests/test_storage_upgrade/client_2_5_4_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_5_4_seeded b/tests/test_storage_upgrade/client_2_5_4_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_5_4_seeded rename to tests/test_storage_upgrade/client_2_5_4_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_5_4_trezor_multiacc b/tests/test_storage_upgrade/client_2_5_4_trezor_multiacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_5_4_trezor_multiacc rename to tests/test_storage_upgrade/client_2_5_4_trezor_multiacc diff --git a/electrum/tests/test_storage_upgrade/client_2_5_4_trezor_singleacc b/tests/test_storage_upgrade/client_2_5_4_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_5_4_trezor_singleacc rename to tests/test_storage_upgrade/client_2_5_4_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_5_4_watchaddresses b/tests/test_storage_upgrade/client_2_5_4_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_5_4_watchaddresses rename to tests/test_storage_upgrade/client_2_5_4_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_6_4_importedkeys b/tests/test_storage_upgrade/client_2_6_4_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_6_4_importedkeys rename to tests/test_storage_upgrade/client_2_6_4_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_6_4_multisig b/tests/test_storage_upgrade/client_2_6_4_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_6_4_multisig rename to tests/test_storage_upgrade/client_2_6_4_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_6_4_seeded b/tests/test_storage_upgrade/client_2_6_4_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_6_4_seeded rename to tests/test_storage_upgrade/client_2_6_4_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_6_4_watchaddresses b/tests/test_storage_upgrade/client_2_6_4_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_6_4_watchaddresses rename to tests/test_storage_upgrade/client_2_6_4_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_7_18_importedkeys b/tests/test_storage_upgrade/client_2_7_18_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_7_18_importedkeys rename to tests/test_storage_upgrade/client_2_7_18_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_7_18_multisig b/tests/test_storage_upgrade/client_2_7_18_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_7_18_multisig rename to tests/test_storage_upgrade/client_2_7_18_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_7_18_seeded b/tests/test_storage_upgrade/client_2_7_18_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_7_18_seeded rename to tests/test_storage_upgrade/client_2_7_18_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_7_18_trezor_singleacc b/tests/test_storage_upgrade/client_2_7_18_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_7_18_trezor_singleacc rename to tests/test_storage_upgrade/client_2_7_18_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_7_18_watchaddresses b/tests/test_storage_upgrade/client_2_7_18_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_7_18_watchaddresses rename to tests/test_storage_upgrade/client_2_7_18_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_8_3_importedkeys b/tests/test_storage_upgrade/client_2_8_3_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_8_3_importedkeys rename to tests/test_storage_upgrade/client_2_8_3_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_8_3_importedkeys_flawed_previous_upgrade_from_2_7_18 b/tests/test_storage_upgrade/client_2_8_3_importedkeys_flawed_previous_upgrade_from_2_7_18 similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_8_3_importedkeys_flawed_previous_upgrade_from_2_7_18 rename to tests/test_storage_upgrade/client_2_8_3_importedkeys_flawed_previous_upgrade_from_2_7_18 diff --git a/electrum/tests/test_storage_upgrade/client_2_8_3_multisig b/tests/test_storage_upgrade/client_2_8_3_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_8_3_multisig rename to tests/test_storage_upgrade/client_2_8_3_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_8_3_seeded b/tests/test_storage_upgrade/client_2_8_3_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_8_3_seeded rename to tests/test_storage_upgrade/client_2_8_3_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_8_3_trezor_singleacc b/tests/test_storage_upgrade/client_2_8_3_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_8_3_trezor_singleacc rename to tests/test_storage_upgrade/client_2_8_3_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_8_3_watchaddresses b/tests/test_storage_upgrade/client_2_8_3_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_8_3_watchaddresses rename to tests/test_storage_upgrade/client_2_8_3_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_2_9_3_importedkeys b/tests/test_storage_upgrade/client_2_9_3_importedkeys similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_9_3_importedkeys rename to tests/test_storage_upgrade/client_2_9_3_importedkeys diff --git a/electrum/tests/test_storage_upgrade/client_2_9_3_importedkeys_keystore_changes b/tests/test_storage_upgrade/client_2_9_3_importedkeys_keystore_changes similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_9_3_importedkeys_keystore_changes rename to tests/test_storage_upgrade/client_2_9_3_importedkeys_keystore_changes diff --git a/electrum/tests/test_storage_upgrade/client_2_9_3_multisig b/tests/test_storage_upgrade/client_2_9_3_multisig similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_9_3_multisig rename to tests/test_storage_upgrade/client_2_9_3_multisig diff --git a/electrum/tests/test_storage_upgrade/client_2_9_3_old_seeded_with_realistic_history b/tests/test_storage_upgrade/client_2_9_3_old_seeded_with_realistic_history similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_9_3_old_seeded_with_realistic_history rename to tests/test_storage_upgrade/client_2_9_3_old_seeded_with_realistic_history diff --git a/electrum/tests/test_storage_upgrade/client_2_9_3_seeded b/tests/test_storage_upgrade/client_2_9_3_seeded similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_9_3_seeded rename to tests/test_storage_upgrade/client_2_9_3_seeded diff --git a/electrum/tests/test_storage_upgrade/client_2_9_3_trezor_singleacc b/tests/test_storage_upgrade/client_2_9_3_trezor_singleacc similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_9_3_trezor_singleacc rename to tests/test_storage_upgrade/client_2_9_3_trezor_singleacc diff --git a/electrum/tests/test_storage_upgrade/client_2_9_3_watchaddresses b/tests/test_storage_upgrade/client_2_9_3_watchaddresses similarity index 100% rename from electrum/tests/test_storage_upgrade/client_2_9_3_watchaddresses rename to tests/test_storage_upgrade/client_2_9_3_watchaddresses diff --git a/electrum/tests/test_storage_upgrade/client_3_2_3_ledger_standard_keystore_changes b/tests/test_storage_upgrade/client_3_2_3_ledger_standard_keystore_changes similarity index 100% rename from electrum/tests/test_storage_upgrade/client_3_2_3_ledger_standard_keystore_changes rename to tests/test_storage_upgrade/client_3_2_3_ledger_standard_keystore_changes diff --git a/electrum/tests/test_storage_upgrade/client_3_3_8_xpub_with_realistic_history b/tests/test_storage_upgrade/client_3_3_8_xpub_with_realistic_history similarity index 100% rename from electrum/tests/test_storage_upgrade/client_3_3_8_xpub_with_realistic_history rename to tests/test_storage_upgrade/client_3_3_8_xpub_with_realistic_history diff --git a/electrum/tests/test_transaction.py b/tests/test_transaction.py similarity index 100% rename from electrum/tests/test_transaction.py rename to tests/test_transaction.py diff --git a/electrum/tests/test_util.py b/tests/test_util.py similarity index 100% rename from electrum/tests/test_util.py rename to tests/test_util.py diff --git a/electrum/tests/test_verifier.py b/tests/test_verifier.py similarity index 100% rename from electrum/tests/test_verifier.py rename to tests/test_verifier.py diff --git a/electrum/tests/test_wallet.py b/tests/test_wallet.py similarity index 100% rename from electrum/tests/test_wallet.py rename to tests/test_wallet.py diff --git a/electrum/tests/test_wallet_vertical.py b/tests/test_wallet_vertical.py similarity index 100% rename from electrum/tests/test_wallet_vertical.py rename to tests/test_wallet_vertical.py diff --git a/electrum/tests/test_x509.py b/tests/test_x509.py similarity index 100% rename from electrum/tests/test_x509.py rename to tests/test_x509.py diff --git a/tox.ini b/tox.ini index 3e1aaafb6..0007b6b45 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,8 @@ passenv= PYTHONDEVMODE commands= coverage run --source=electrum \ - '--omit=electrum/gui/*,electrum/plugins/*,electrum/scripts/*,electrum/tests/*' \ - -m pytest electrum/tests -v + '--omit=electrum/gui/*,electrum/plugins/*,electrum/scripts/*' \ + -m pytest tests -v coverage report extras= tests