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 @@ -39,8 +39,8 @@ import os import time -from test_framework.test_framework import BitcoinTestFramework from test_framework.p2p import P2PTxInvStore +from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, assert_greater_than_or_equal, diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -11,9 +11,7 @@ NODE_NETWORK, msg_addr, ) -from test_framework.p2p import ( - P2PInterface, -) +from test_framework.p2p import P2PInterface from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, diff --git a/test/functional/p2p_eviction.py b/test/functional/p2p_eviction.py --- a/test/functional/p2p_eviction.py +++ b/test/functional/p2p_eviction.py @@ -15,11 +15,11 @@ import time -from test_framework.test_framework import BitcoinTestFramework -from test_framework.p2p import P2PInterface, P2PDataStore -from test_framework.util import assert_equal, wait_until from test_framework.blocktools import create_block, create_coinbase from test_framework.messages import CTransaction, FromHex, msg_pong, msg_tx +from test_framework.p2p import P2PDataStore, P2PInterface +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, wait_until class SlowP2PDataStore(P2PDataStore): diff --git a/test/functional/p2p_feefilter.py b/test/functional/p2p_feefilter.py --- a/test/functional/p2p_feefilter.py +++ b/test/functional/p2p_feefilter.py @@ -9,8 +9,8 @@ from test_framework.messages import MSG_TX, msg_feefilter from test_framework.p2p import ( - p2p_lock, P2PInterface, + p2p_lock, ) from test_framework.test_framework import BitcoinTestFramework 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 @@ -23,16 +23,6 @@ import http.client import subprocess -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import ( - assert_equal, - assert_greater_than, - assert_greater_than_or_equal, - assert_raises, - assert_raises_rpc_error, - assert_is_hash_string, - assert_is_hex_string, -) from test_framework.blocktools import ( create_block, create_coinbase, @@ -41,8 +31,16 @@ from test_framework.messages import ( msg_block, ) -from test_framework.p2p import ( - P2PInterface, +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_raises, + assert_raises_rpc_error, + assert_is_hex_string, + assert_is_hash_string, ) 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 @@ -11,6 +11,13 @@ from itertools import product import time +from test_framework.p2p import P2PInterface +import test_framework.messages +from test_framework.messages import ( + CAddress, + msg_addr, + NODE_NETWORK, +) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_approx, @@ -22,13 +29,6 @@ p2p_port, wait_until, ) -from test_framework.p2p import P2PInterface -import test_framework.messages -from test_framework.messages import ( - CAddress, - msg_addr, - NODE_NETWORK, -) def assert_net_servicesnames(servicesflag, servicenames): diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -19,8 +19,8 @@ from .authproxy import JSONRPCException from . import coverage -from .test_node import TestNode from .p2p import NetworkThread +from .test_node import TestNode from .util import ( assert_equal, check_json_precision,