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 @@ -6,10 +6,19 @@ # Test for -rpcbind, as well as -rpcallowip and -rpcconnect from platform import uname +import socket +import sys +from test_framework.netutil import addr_to_hex, all_interfaces, get_bind_addrs from test_framework.test_framework import BitcoinTestFramework, SkipTest -from test_framework.util import * -from test_framework.netutil import * +from test_framework.util import ( + assert_equal, + assert_raises_rpc_error, + get_datadir_path, + get_rpc_proxy, + rpc_port, + rpc_url, +) class RPCBindTest(BitcoinTestFramework): 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 @@ -27,8 +27,8 @@ assert_equal, assert_raises, assert_raises_rpc_error, - assert_is_hex_string, assert_is_hash_string, + assert_is_hex_string, ) diff --git a/test/functional/rpc_decodescript.py b/test/functional/rpc_decodescript.py --- a/test/functional/rpc_decodescript.py +++ b/test/functional/rpc_decodescript.py @@ -3,9 +3,9 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * from test_framework.messages import CTransaction, FromHex, ToHex +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, bytes_to_hex_str, hex_str_to_bytes class DecodeScriptTest(BitcoinTestFramework): diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -3,9 +3,18 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. +from decimal import Decimal + +from test_framework.messages import CTransaction, FromHex from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import CTransaction, FromHex +from test_framework.util import ( + assert_equal, + assert_fee_amount, + assert_greater_than, + assert_greater_than_or_equal, + assert_raises_rpc_error, + connect_nodes_bi, +) def get_unspent(listunspent, amount): 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 @@ -7,8 +7,10 @@ # Test InvalidateBlock code # +import time + from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, connect_nodes_bi, sync_blocks class InvalidateTest(BitcoinTestFramework): diff --git a/test/functional/rpc_listtransactions.py b/test/functional/rpc_listtransactions.py --- a/test/functional/rpc_listtransactions.py +++ b/test/functional/rpc_listtransactions.py @@ -5,8 +5,10 @@ # Exercise the listtransactions API +from decimal import Decimal + from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_array_result class ListTransactionsTest(BitcoinTestFramework): 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 @@ -11,10 +11,16 @@ # - decoderawtransaction # - getrawtransaction """ +from decimal import Decimal from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * from test_framework.txtools import pad_raw_tx +from test_framework.util import ( + assert_equal, + assert_greater_than, + assert_raises_rpc_error, + connect_nodes_bi, +) # Create one-input, one-output, no-fee transaction: diff --git a/test/functional/rpc_signrawtransaction.py b/test/functional/rpc_signrawtransaction.py --- a/test/functional/rpc_signrawtransaction.py +++ b/test/functional/rpc_signrawtransaction.py @@ -4,7 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error class SignRawTransactionsTest(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 @@ -8,7 +8,11 @@ # from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import ( + assert_equal, + assert_raises_rpc_error, + connect_nodes, +) 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,13 +7,13 @@ # Test multiple rpc user config option rpcauth # -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import str_to_b64str, assert_equal - -import os import http.client +import os import urllib.parse +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, str_to_b64str + class HTTPBasicsTest (BitcoinTestFramework): def set_test_params(self):