Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-13 03:30:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

QA: Use addconnection rather than addnode onetry

Browse Source
This commit is contained in:
Luke Dashjr 2022-02-06 02:08:41 +00:00
parent 7ab4fecd0f
commit 7137ef57b5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/feature_block.py
View File

@ -1412,7 +1412,7 @@ class FullBlockTest(BitcoinTestFramework):
"""Add a P2P connection to the node. """Add a P2P connection to the node.
Helper to connect and wait for version handshake.""" Helper to connect and wait for version handshake."""
self.helper_peer = self.nodes[0].add_p2p_connection(P2PDataStore(), node_outgoing=True) self.helper_peer = self.nodes[0].add_outbound_p2p_connection(P2PDataStore(), p2p_idx=0)
# We need to wait for the initial getheaders from the peer before we # We need to wait for the initial getheaders from the peer before we
# start populating our blockstore. If we don't, then we may run ahead # start populating our blockstore. If we don't, then we may run ahead
# to the next subtest before we receive the getheaders. We'd then send # to the next subtest before we receive the getheaders. We'd then send

6
test/functional/p2p_dos_header_tree.py
View File

@ -47,7 +47,7 @@ class RejectLowDifficultyHeadersTest(BitcoinTestFramework):
self.headers_fork = [from_hex(CBlockHeader(), h) for h in self.headers_fork] self.headers_fork = [from_hex(CBlockHeader(), h) for h in self.headers_fork]
self.log.info("Feed all non-fork headers, including and up to the first checkpoint") self.log.info("Feed all non-fork headers, including and up to the first checkpoint")
peer_checkpoint = self.nodes[0].add_p2p_connection(P2PInterface(), node_outgoing=True) peer_checkpoint = self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=0)
peer_checkpoint.send_and_ping(msg_headers(self.headers)) peer_checkpoint.send_and_ping(msg_headers(self.headers))
assert { assert {
'height': 546, 'height': 546,
@ -64,7 +64,7 @@ class RejectLowDifficultyHeadersTest(BitcoinTestFramework):
self.log.info("Feed all fork headers (succeeds without checkpoint)") self.log.info("Feed all fork headers (succeeds without checkpoint)")
# On node 0 it succeeds because checkpoints are disabled # On node 0 it succeeds because checkpoints are disabled
self.restart_node(0, extra_args=['-nocheckpoints', "-minimumchainwork=0x0", '-prune=550']) self.restart_node(0, extra_args=['-nocheckpoints', "-minimumchainwork=0x0", '-prune=550'])
peer_no_checkpoint = self.nodes[0].add_p2p_connection(P2PInterface(), node_outgoing=True) peer_no_checkpoint = self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=0)
peer_no_checkpoint.send_and_ping(msg_headers(self.headers_fork)) peer_no_checkpoint.send_and_ping(msg_headers(self.headers_fork))
assert { assert {
"height": 2, "height": 2,
@ -74,7 +74,7 @@ class RejectLowDifficultyHeadersTest(BitcoinTestFramework):
} in self.nodes[0].getchaintips() } in self.nodes[0].getchaintips()
# On node 1 it succeeds because no checkpoint has been reached yet by a chain tip # On node 1 it succeeds because no checkpoint has been reached yet by a chain tip
peer_before_checkpoint = self.nodes[1].add_p2p_connection(P2PInterface(), node_outgoing=True) peer_before_checkpoint = self.nodes[1].add_outbound_p2p_connection(P2PInterface(), p2p_idx=1)
peer_before_checkpoint.send_and_ping(msg_headers(self.headers_fork)) peer_before_checkpoint.send_and_ping(msg_headers(self.headers_fork))
assert { assert {
"height": 2, "height": 2,

4
test/functional/p2p_invalid_tx.py
View File

@ -33,8 +33,8 @@ class InvalidTxRequestTest(BitcoinTestFramework):
"""Add a P2P connection to the node. """Add a P2P connection to the node.
Helper to connect and wait for version handshake.""" Helper to connect and wait for version handshake."""
for _ in range(num_connections): for i in range(num_connections):
self.nodes[0].add_p2p_connection(P2PDataStore(), node_outgoing=True) self.nodes[0].add_outbound_p2p_connection(P2PDataStore(), p2p_idx=i)
def reconnect_p2p(self, **kwargs): def reconnect_p2p(self, **kwargs):
"""Tear down and bootstrap the P2P connection to the node. """Tear down and bootstrap the P2P connection to the node.

6
test/functional/p2p_unrequested_blocks.py
View File

@ -80,7 +80,7 @@ class AcceptBlockTest(BitcoinTestFramework):
return False return False
def run_test(self): def run_test(self):
test_node = self.nodes[0].add_p2p_connection(P2PInterface(), node_outgoing=True) test_node = self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=0)
min_work_node = self.nodes[1].add_p2p_connection(P2PInterface()) min_work_node = self.nodes[1].add_p2p_connection(P2PInterface())
# 1. Have nodes mine a block (leave IBD) # 1. Have nodes mine a block (leave IBD)
@ -203,7 +203,7 @@ class AcceptBlockTest(BitcoinTestFramework):
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()
self.nodes[1].disconnect_p2ps() self.nodes[1].disconnect_p2ps()
test_node = self.nodes[0].add_p2p_connection(P2PInterface(), node_outgoing=True) test_node = self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=2)
test_node.send_and_ping(msg_block(block_h1f)) test_node.send_and_ping(msg_block(block_h1f))
assert_equal(self.nodes[0].getblockcount(), 2) assert_equal(self.nodes[0].getblockcount(), 2)
@ -275,7 +275,7 @@ class AcceptBlockTest(BitcoinTestFramework):
test_node.wait_for_disconnect() test_node.wait_for_disconnect()
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()
test_node = self.nodes[0].add_p2p_connection(P2PInterface(), node_outgoing=True) test_node = self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=3)
# We should have failed reorg and switched back to 290 (but have block 291) # We should have failed reorg and switched back to 290 (but have block 291)
assert_equal(self.nodes[0].getblockcount(), 290) assert_equal(self.nodes[0].getblockcount(), 290)