mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-02 09:15:04 +02:00
[init] Remove -addrmantest command line arg
-addrmantest is only used in `p2p_node_network_limited.py` test to test if the node self-advertises a hard-coded local address (which wouldn't be advertised in the tests because it's unroutable without the test-only code path) to check pruning-related services are correct in that addr. Remove -addrmantest because the self advertisement happens because of hard coded test path logic, and expected services are nominal due to how easily the test-only code could diverge from mainnet logic. It's also being used only in 1 test.
This commit is contained in:
@@ -15,7 +15,6 @@ from test_framework.messages import (
|
||||
NODE_P2P_V2,
|
||||
NODE_WITNESS,
|
||||
msg_getdata,
|
||||
msg_verack,
|
||||
)
|
||||
from test_framework.p2p import P2PInterface
|
||||
from test_framework.test_framework import BitcoinTestFramework
|
||||
@@ -43,7 +42,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
|
||||
def set_test_params(self):
|
||||
self.setup_clean_chain = True
|
||||
self.num_nodes = 3
|
||||
self.extra_args = [['-prune=550', '-addrmantest'], [], []]
|
||||
self.extra_args = [['-prune=550'], [], []]
|
||||
|
||||
def disconnect_all(self):
|
||||
self.disconnect_nodes(0, 1)
|
||||
@@ -78,16 +77,6 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
|
||||
self.log.info("Requesting block at height 2 (tip-289) must fail (ignored).")
|
||||
node.send_getdata_for_block(blocks[0]) # first block outside of the 288+2 limit
|
||||
node.wait_for_disconnect(5)
|
||||
|
||||
self.log.info("Check local address relay, do a fresh connection.")
|
||||
self.nodes[0].disconnect_p2ps()
|
||||
node1 = self.nodes[0].add_p2p_connection(P2PIgnoreInv())
|
||||
node1.send_message(msg_verack())
|
||||
|
||||
node1.wait_for_addr()
|
||||
#must relay address with NODE_NETWORK_LIMITED
|
||||
assert_equal(node1.firstAddrnServices, expected_services)
|
||||
|
||||
self.nodes[0].disconnect_p2ps()
|
||||
|
||||
# connect unsynced node 2 with pruned NODE_NETWORK_LIMITED peer
|
||||
|
||||
Reference in New Issue
Block a user