diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -5,8 +5,11 @@ # Test mempool limiting together/eviction with the wallet +from test_framework.blocktools import ( + create_confirmed_utxos, + send_big_transactions, +) from test_framework.test_framework import BitcoinTestFramework -from test_framework.blocktools import send_big_transactions, create_confirmed_utxos class MempoolLimitTest(BitcoinTestFramework): diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py --- a/test/functional/mempool_packages.py +++ b/test/functional/mempool_packages.py @@ -4,9 +4,17 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test descendant package tracking code.""" +from decimal import Decimal + +from test_framework.messages import COIN from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import COIN +from test_framework.util import ( + assert_equal, + assert_raises_rpc_error, + satoshi_round, + sync_blocks, + sync_mempools, +) MAX_ANCESTORS = 25 MAX_DESCENDANTS = 25 diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -30,10 +30,11 @@ does not overwrite a previously valid mempool stored on disk. """ +from decimal import Decimal import time from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, wait_until class MempoolPersistTest(BitcoinTestFramework): diff --git a/test/functional/mempool_reorg.py b/test/functional/mempool_reorg.py --- a/test/functional/mempool_reorg.py +++ b/test/functional/mempool_reorg.py @@ -9,7 +9,7 @@ # from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error, create_tx # Create one-input, one-output, no-fee transaction: diff --git a/test/functional/mempool_resurrect.py b/test/functional/mempool_resurrect.py --- a/test/functional/mempool_resurrect.py +++ b/test/functional/mempool_resurrect.py @@ -9,7 +9,7 @@ # from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, create_tx # Create one-input, one-output, no-fee transaction: diff --git a/test/functional/mempool_spend_coinbase.py b/test/functional/mempool_spend_coinbase.py --- a/test/functional/mempool_spend_coinbase.py +++ b/test/functional/mempool_spend_coinbase.py @@ -14,8 +14,7 @@ # from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * - +from test_framework.util import assert_equal, assert_raises_rpc_error, create_tx # Create one-input, one-output, no-fee transaction: