sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#25312: test: Fix port collisions caused by p2p_getaddr_caching.py

Browse Source 
ea54ba2f42f6d0b23570c665c2369f977bf55cf6 [test] Fix port collisions caused by p2p_getaddr_caching.py (dergoegge)
f9682e75ac184a62c7e29287882df34c25303033 [test_framework] Set PortSeed.n directly after initialising params (dergoegge)

Pull request description:

  This PR fixes the issue mentioned [here](https://github.com/bitcoin/bitcoin/pull/25096#discussion_r892558783), to avoid port collisions between nodes spun up by the test framework.

Top commit has no ACKs.

Tree-SHA512: ec9159f0af90db636f7889d664c24e1430cf2bcb3c02a9ab2dcfe531b2a4d18f6e3a0f8ba73071bdf2f7db518df9d5d86a9cd06695e67644d20fe4515fac32b7
This commit is contained in:
MacroFake 2022-06-10 12:37:19 +02:00 committed by pasta
parent aaa83ae043
commit c1fa5a0f15
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/functional/p2p_getaddr_caching.py
View File

@ -12,8 +12,7 @@ from test_framework.p2p import (
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import ( from test_framework.util import (
assert_equal, assert_equal,
PORT_MIN, p2p_port,
PORT_RANGE,
) )
# As defined in net_processing. # As defined in net_processing.
@ -42,10 +41,9 @@ class AddrReceiver(P2PInterface):
class AddrTest(BitcoinTestFramework): class AddrTest(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
self.num_nodes = 1 self.num_nodes = 1
# Start onion ports after p2p and rpc ports. # Use some of the remaining p2p ports for the onion binds.
port = PORT_MIN + 2 * PORT_RANGE self.onion_port1 = p2p_port(1)
self.onion_port1 = port self.onion_port2 = p2p_port(2)
self.onion_port2 = port + 1
self.extra_args = [ self.extra_args = [
[f"-bind=127.0.0.1:{self.onion_port1}=onion", f"-bind=127.0.0.1:{self.onion_port2}=onion"], [f"-bind=127.0.0.1:{self.onion_port1}=onion", f"-bind=127.0.0.1:{self.onion_port2}=onion"],
] ]

4
test/functional/test_framework/test_framework.py
View File

@ -236,11 +236,11 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
# source: https://stackoverflow.com/questions/48796169/how-to-fix-ipykernel-launcher-py-error-unrecognized-arguments-in-jupyter/56349168#56349168 # source: https://stackoverflow.com/questions/48796169/how-to-fix-ipykernel-launcher-py-error-unrecognized-arguments-in-jupyter/56349168#56349168
parser.add_argument("-f", "--fff", help="a dummy argument to fool ipython", default="1") parser.add_argument("-f", "--fff", help="a dummy argument to fool ipython", default="1")
PortSeed.n = self.options.port_seed
def setup(self): def setup(self):
"""Call this method to start up the test framework object with options set.""" """Call this method to start up the test framework object with options set."""
PortSeed.n = self.options.port_seed
check_json_precision() check_json_precision()
self.options.cachedir = os.path.abspath(self.options.cachedir) self.options.cachedir = os.path.abspath(self.options.cachedir)