diff --git a/test/functional/rpc_bind.py b/test/functional/rpc_bind.py --- a/test/functional/rpc_bind.py +++ b/test/functional/rpc_bind.py @@ -4,10 +4,15 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test running bitcoind with the -rpcbind and -rpcallowip options.""" -from platform import uname import sys +from platform import uname -from test_framework.netutil import addr_to_hex, all_interfaces, get_bind_addrs, test_ipv6_local +from test_framework.netutil import ( + addr_to_hex, + all_interfaces, + get_bind_addrs, + test_ipv6_local, +) from test_framework.test_framework import BitcoinTestFramework, SkipTest from test_framework.util import ( assert_equal, diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -19,30 +19,26 @@ Tests correspond to code in rpc/blockchain.cpp. """ -from decimal import Decimal import http.client import subprocess +from decimal import Decimal from test_framework.blocktools import ( + TIME_GENESIS_BLOCK, create_block, create_coinbase, - TIME_GENESIS_BLOCK, -) -from test_framework.messages import ( - CBlockHeader, - FromHex, - msg_block, ) +from test_framework.messages import CBlockHeader, FromHex, msg_block from test_framework.p2p import P2PInterface from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, assert_greater_than, assert_greater_than_or_equal, + assert_is_hash_string, + assert_is_hex_string, assert_raises, assert_raises_rpc_error, - assert_is_hex_string, - assert_is_hash_string, ) diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py --- a/test/functional/rpc_createmultisig.py +++ b/test/functional/rpc_createmultisig.py @@ -12,10 +12,7 @@ from test_framework.descriptors import descsum_create, drop_origins from test_framework.key import ECPubKey from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_raises_rpc_error, - assert_equal, -) +from test_framework.util import assert_equal, assert_raises_rpc_error class RpcCreateMultiSigTest(BitcoinTestFramework): diff --git a/test/functional/rpc_deriveaddresses.py b/test/functional/rpc_deriveaddresses.py --- a/test/functional/rpc_deriveaddresses.py +++ b/test/functional/rpc_deriveaddresses.py @@ -3,8 +3,8 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the deriveaddresses rpc call.""" -from test_framework.test_framework import BitcoinTestFramework from test_framework.descriptors import descsum_create +from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal, assert_raises_rpc_error diff --git a/test/functional/rpc_dumptxoutset.py b/test/functional/rpc_dumptxoutset.py --- a/test/functional/rpc_dumptxoutset.py +++ b/test/functional/rpc_dumptxoutset.py @@ -4,12 +4,12 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the generation of UTXO snapshots using `dumptxoutset`. """ -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import assert_equal, assert_raises_rpc_error - import hashlib from pathlib import Path +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error + class DumptxoutsetTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/rpc_generate.py b/test/functional/rpc_generate.py --- a/test/functional/rpc_generate.py +++ b/test/functional/rpc_generate.py @@ -5,10 +5,7 @@ """Test generate RPC.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_equal, - assert_raises_rpc_error, -) +from test_framework.util import assert_equal, assert_raises_rpc_error class RPCGenerateTest(BitcoinTestFramework): diff --git a/test/functional/rpc_generateblock.py b/test/functional/rpc_generateblock.py --- a/test/functional/rpc_generateblock.py +++ b/test/functional/rpc_generateblock.py @@ -6,10 +6,7 @@ ''' from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_equal, - assert_raises_rpc_error, -) +from test_framework.util import assert_equal, assert_raises_rpc_error class GenerateBlockTest(BitcoinTestFramework): diff --git a/test/functional/rpc_getblockfilter.py b/test/functional/rpc_getblockfilter.py --- a/test/functional/rpc_getblockfilter.py +++ b/test/functional/rpc_getblockfilter.py @@ -6,8 +6,11 @@ from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( - assert_equal, assert_is_hex_string, assert_raises_rpc_error, - connect_nodes, disconnect_nodes + assert_equal, + assert_is_hex_string, + assert_raises_rpc_error, + connect_nodes, + disconnect_nodes, ) FILTER_TYPES = ["basic"] diff --git a/test/functional/rpc_getblockstats.py b/test/functional/rpc_getblockstats.py --- a/test/functional/rpc_getblockstats.py +++ b/test/functional/rpc_getblockstats.py @@ -11,10 +11,7 @@ import os from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_equal, - assert_raises_rpc_error, -) +from test_framework.util import assert_equal, assert_raises_rpc_error TESTSDIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/test/functional/rpc_getdescriptorinfo.py b/test/functional/rpc_getdescriptorinfo.py --- a/test/functional/rpc_getdescriptorinfo.py +++ b/test/functional/rpc_getdescriptorinfo.py @@ -5,12 +5,9 @@ """Test getdescriptorinfo RPC. """ -from test_framework.test_framework import BitcoinTestFramework from test_framework.descriptors import descsum_create -from test_framework.util import ( - assert_equal, - assert_raises_rpc_error, -) +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error class DescriptorTest(BitcoinTestFramework): diff --git a/test/functional/rpc_help.py b/test/functional/rpc_help.py --- a/test/functional/rpc_help.py +++ b/test/functional/rpc_help.py @@ -4,11 +4,11 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPC help output.""" +import os + from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal, assert_raises_rpc_error -import os - class HelpRpcTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/rpc_invalidateblock.py b/test/functional/rpc_invalidateblock.py --- a/test/functional/rpc_invalidateblock.py +++ b/test/functional/rpc_invalidateblock.py @@ -6,10 +6,7 @@ from test_framework.address import ADDRESS_ECREG_UNSPENDABLE_DESCRIPTOR from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_equal, - connect_nodes, -) +from test_framework.util import assert_equal, connect_nodes class InvalidateTest(BitcoinTestFramework): diff --git a/test/functional/rpc_misc.py b/test/functional/rpc_misc.py --- a/test/functional/rpc_misc.py +++ b/test/functional/rpc_misc.py @@ -5,16 +5,15 @@ """Test RPC misc output.""" import xml.etree.ElementTree as ET +from test_framework.authproxy import JSONRPCException from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( - assert_raises_rpc_error, assert_equal, assert_greater_than, assert_greater_than_or_equal, + assert_raises_rpc_error, ) -from test_framework.authproxy import JSONRPCException - class RpcMiscTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -7,21 +7,21 @@ Tests correspond to code in rpc/net.cpp. """ +import time from decimal import Decimal from itertools import product -import time +import test_framework.messages from test_framework.avatools import create_coinbase_stakes from test_framework.key import ECKey -from test_framework.p2p import P2PInterface -import test_framework.messages from test_framework.messages import NODE_NETWORK +from test_framework.p2p import P2PInterface from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_approx, assert_equal, - assert_greater_than_or_equal, assert_greater_than, + assert_greater_than_or_equal, assert_raises_rpc_error, connect_nodes, p2p_port, diff --git a/test/functional/rpc_preciousblock.py b/test/functional/rpc_preciousblock.py --- a/test/functional/rpc_preciousblock.py +++ b/test/functional/rpc_preciousblock.py @@ -5,10 +5,7 @@ """Test the preciousblock RPC.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_equal, - connect_nodes, -) +from test_framework.util import assert_equal, connect_nodes def unidirectional_node_sync_via_rpc(node_src, node_dest): diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -7,8 +7,8 @@ import json import os - from decimal import Decimal + from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_approx, diff --git a/test/functional/rpc_rawtransaction.py b/test/functional/rpc_rawtransaction.py --- a/test/functional/rpc_rawtransaction.py +++ b/test/functional/rpc_rawtransaction.py @@ -12,10 +12,10 @@ - getrawtransaction """ -from decimal import Decimal - from collections import OrderedDict +from decimal import Decimal from io import BytesIO + from test_framework.messages import ( COutPoint, CTransaction, diff --git a/test/functional/rpc_setban.py b/test/functional/rpc_setban.py --- a/test/functional/rpc_setban.py +++ b/test/functional/rpc_setban.py @@ -5,10 +5,7 @@ """Test the setban rpc call.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - connect_nodes, - p2p_port -) +from test_framework.util import connect_nodes, p2p_port class SetBanTests(BitcoinTestFramework): diff --git a/test/functional/rpc_txoutproof.py b/test/functional/rpc_txoutproof.py --- a/test/functional/rpc_txoutproof.py +++ b/test/functional/rpc_txoutproof.py @@ -4,13 +4,13 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test gettxoutproof and verifytxoutproof RPCs.""" +from test_framework.messages import CMerkleBlock, FromHex, ToHex from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, connect_nodes, ) -from test_framework.messages import CMerkleBlock, FromHex, ToHex class MerkleBlockTest(BitcoinTestFramework): diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py --- a/test/functional/rpc_users.py +++ b/test/functional/rpc_users.py @@ -7,18 +7,14 @@ import configparser import http.client import os -from random import SystemRandom import string import subprocess import sys import urllib.parse +from random import SystemRandom from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_equal, - get_datadir_path, - str_to_b64str, -) +from test_framework.util import assert_equal, get_datadir_path, str_to_b64str def call_with_auth(node, user, password): diff --git a/test/functional/rpc_whitelist.py b/test/functional/rpc_whitelist.py --- a/test/functional/rpc_whitelist.py +++ b/test/functional/rpc_whitelist.py @@ -5,16 +5,13 @@ """ A test for RPC users with restricted permissions """ -from test_framework.test_framework import BitcoinTestFramework -import os -from test_framework.util import ( - get_datadir_path, - assert_equal, - str_to_b64str -) import http.client +import os import urllib.parse +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, get_datadir_path, str_to_b64str + def rpccall(node, user, method): url = urllib.parse.urlparse(node.url)