diff options
-rwxr-xr-x | test/functional/example_test.py | 2 | ||||
-rwxr-xr-x | test/functional/feature_versionbits_warning.py | 2 | ||||
-rwxr-xr-x | test/functional/mempool_persist.py | 2 | ||||
-rwxr-xr-x | test/functional/p2p_addr_relay.py | 4 | ||||
-rwxr-xr-x | test/functional/p2p_eviction.py | 6 | ||||
-rwxr-xr-x | test/functional/p2p_feefilter.py | 2 | ||||
-rwxr-xr-x | test/functional/rpc_blockchain.py | 22 | ||||
-rwxr-xr-x | test/functional/rpc_net.py | 12 | ||||
-rwxr-xr-x | test/functional/test_framework/test_framework.py | 2 |
9 files changed, 25 insertions, 29 deletions
diff --git a/test/functional/example_test.py b/test/functional/example_test.py index c69b078c6e..32a167bcd5 100755 --- a/test/functional/example_test.py +++ b/test/functional/example_test.py @@ -18,9 +18,9 @@ from test_framework.blocktools import (create_block, create_coinbase) from test_framework.messages import CInv, MSG_BLOCK from test_framework.p2p import ( P2PInterface, - p2p_lock, msg_block, msg_getdata, + p2p_lock, ) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( diff --git a/test/functional/feature_versionbits_warning.py b/test/functional/feature_versionbits_warning.py index 376a27e5f5..78c295b6e8 100755 --- a/test/functional/feature_versionbits_warning.py +++ b/test/functional/feature_versionbits_warning.py @@ -12,7 +12,7 @@ import re from test_framework.blocktools import create_block, create_coinbase from test_framework.messages import msg_block -from test_framework.p2p import P2PInterface, p2p_lock +from test_framework.p2p import p2p_lock, P2PInterface from test_framework.test_framework import BitcoinTestFramework from test_framework.util import wait_until diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py index cf2cd611bd..00854656f8 100755 --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -39,8 +39,8 @@ from decimal import Decimal 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 index caefe86a67..80f262d0d3 100755 --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -12,9 +12,7 @@ from test_framework.messages import ( NODE_WITNESS, 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 index e076f8d8df..848df4a585 100755 --- a/test/functional/p2p_eviction.py +++ b/test/functional/p2p_eviction.py @@ -15,11 +15,11 @@ Therefore, this test is limited to the remaining protection criteria. 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 index 238502951f..63b6107df6 100755 --- a/test/functional/p2p_feefilter.py +++ b/test/functional/p2p_feefilter.py @@ -7,7 +7,7 @@ from decimal import Decimal from test_framework.messages import MSG_TX, MSG_WTX, msg_feefilter -from test_framework.p2p import p2p_lock, P2PInterface +from test_framework.p2p import 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 index 687222dfef..c005584485 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -22,16 +22,6 @@ from decimal import Decimal 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_hex_string, - assert_is_hash_string, -) from test_framework.blocktools import ( create_block, create_coinbase, @@ -42,8 +32,16 @@ from test_framework.messages import ( FromHex, 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 index f952f91c74..068a76f36b 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -9,6 +9,12 @@ Tests correspond to code in rpc/net.cpp. from decimal import Decimal +from test_framework.p2p import P2PInterface +import test_framework.messages +from test_framework.messages import ( + NODE_NETWORK, + NODE_WITNESS, +) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, @@ -19,12 +25,6 @@ from test_framework.util import ( p2p_port, wait_until, ) -from test_framework.p2p import P2PInterface -import test_framework.messages -from test_framework.messages import ( - NODE_NETWORK, - NODE_WITNESS, -) def assert_net_servicesnames(servicesflag, servicenames): diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 3555343095..2a60f8e0c1 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -20,8 +20,8 @@ import time from .authproxy import JSONRPCException from . import coverage -from .test_node import TestNode from .p2p import NetworkThread +from .test_node import TestNode from .util import ( MAX_NODES, PortSeed, |