diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py --- a/test/functional/mining_basic.py +++ b/test/functional/mining_basic.py @@ -11,9 +11,9 @@ import copy from test_framework.blocktools import create_coinbase +from test_framework.messages import CBlock from test_framework.test_framework import BitcoinTestFramework -from test_framework.mininode import CBlock -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error def b2x(b): diff --git a/test/functional/mining_getblocktemplate_longpoll.py b/test/functional/mining_getblocktemplate_longpoll.py --- a/test/functional/mining_getblocktemplate_longpoll.py +++ b/test/functional/mining_getblocktemplate_longpoll.py @@ -3,11 +3,12 @@ # 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 decimal import Decimal import threading +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import get_rpc_proxy, random_transaction + class LongpollThread(threading.Thread): diff --git a/test/functional/mining_prioritisetransaction.py b/test/functional/mining_prioritisetransaction.py --- a/test/functional/mining_prioritisetransaction.py +++ b/test/functional/mining_prioritisetransaction.py @@ -7,12 +7,15 @@ # Test PrioritiseTransaction code # -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import COIN +from test_framework.blocktools import ( + create_confirmed_utxos, + send_big_transactions, +) # FIXME: review how this test needs to be adapted w.r.t _LEGACY_MAX_BLOCK_SIZE from test_framework.cdefs import LEGACY_MAX_BLOCK_SIZE -from test_framework.blocktools import send_big_transactions, create_confirmed_utxos +from test_framework.messages import COIN +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error class PrioritiseTransactionTest(BitcoinTestFramework):