commit c2b0039935cc00530f1eb583ea152885e86b9b81 parent 03cc63205fbc7eb46466d91ee5029450df42c0d4 Author: SomberNight <somber.night@protonmail.com> Date: Thu, 21 Nov 2019 18:51:38 +0100 bitcoin.py: remove some remnants of TYPE_ADDRESS, TYPE_SCRIPT Diffstat:
7 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/electrum/plugins/digitalbitbox/digitalbitbox.py b/electrum/plugins/digitalbitbox/digitalbitbox.py @@ -17,8 +17,7 @@ import time import copy from electrum.crypto import sha256d, EncodeAES_base64, EncodeAES_bytes, DecodeAES_bytes, hmac_oneshot -from electrum.bitcoin import (TYPE_ADDRESS, push_script, var_int, public_key_to_p2pkh, - is_address) +from electrum.bitcoin import public_key_to_p2pkh from electrum.bip32 import BIP32Node, convert_bip32_intpath_to_strpath, is_all_public_derivation from electrum import ecc from electrum.ecc import msg_magic diff --git a/electrum/plugins/hw_wallet/plugin.py b/electrum/plugins/hw_wallet/plugin.py @@ -28,7 +28,7 @@ from typing import TYPE_CHECKING, Dict, List, Union, Tuple, Sequence, Optional, from electrum.plugin import BasePlugin, hook, Device, DeviceMgr from electrum.i18n import _ -from electrum.bitcoin import is_address, TYPE_SCRIPT, opcodes +from electrum.bitcoin import is_address, opcodes from electrum.util import bfh, versiontuple, UserFacingException from electrum.transaction import TxOutput, Transaction, PartialTransaction, PartialTxInput, PartialTxOutput from electrum.bip32 import BIP32Node diff --git a/electrum/plugins/keepkey/keepkey.py b/electrum/plugins/keepkey/keepkey.py @@ -4,7 +4,6 @@ import sys from typing import NamedTuple, Any, Optional, Dict, Union, List, Tuple, TYPE_CHECKING from electrum.util import bfh, bh2u, UserCancelled, UserFacingException -from electrum.bitcoin import TYPE_ADDRESS, TYPE_SCRIPT from electrum.bip32 import BIP32Node from electrum import constants from electrum.i18n import _ diff --git a/electrum/plugins/safe_t/safe_t.py b/electrum/plugins/safe_t/safe_t.py @@ -4,7 +4,6 @@ import sys from typing import NamedTuple, Any, Optional, Dict, Union, List, Tuple, TYPE_CHECKING from electrum.util import bfh, bh2u, versiontuple, UserCancelled, UserFacingException -from electrum.bitcoin import TYPE_ADDRESS, TYPE_SCRIPT from electrum.bip32 import BIP32Node from electrum import constants from electrum.i18n import _ diff --git a/electrum/plugins/trezor/trezor.py b/electrum/plugins/trezor/trezor.py @@ -3,7 +3,6 @@ import sys from typing import NamedTuple, Any, Optional, Dict, Union, List, Tuple, TYPE_CHECKING from electrum.util import bfh, bh2u, versiontuple, UserCancelled, UserFacingException -from electrum.bitcoin import TYPE_ADDRESS, TYPE_SCRIPT from electrum.bip32 import BIP32Node, convert_bip32_path_to_list_of_uint32 as parse_path from electrum import constants from electrum.i18n import _ diff --git a/electrum/plugins/trustedcoin/trustedcoin.py b/electrum/plugins/trustedcoin/trustedcoin.py @@ -36,7 +36,6 @@ from urllib.parse import quote from aiohttp import ClientResponse from electrum import ecc, constants, keystore, version, bip32, bitcoin -from electrum.bitcoin import TYPE_ADDRESS from electrum.bip32 import BIP32Node, xpub_type from electrum.crypto import sha256 from electrum.transaction import PartialTxOutput, PartialTxInput, PartialTransaction, Transaction diff --git a/electrum/tests/test_transaction.py b/electrum/tests/test_transaction.py @@ -2,7 +2,6 @@ from typing import NamedTuple, Union from electrum import transaction, bitcoin from electrum.transaction import convert_raw_tx_to_hex, tx_from_any, Transaction, PartialTransaction -from electrum.bitcoin import TYPE_ADDRESS from electrum.util import bh2u, bfh from electrum import keystore from electrum import bip32