@@ -148,7 +148,8 @@ def node_test(self, node, *, proxies, auth, test_onion, test_cjdns):
148
148
rv = []
149
149
addr = "15.61.23.23:1234"
150
150
self .log .debug (f"Test: outgoing IPv4 connection through node { node .index } for address { addr } " )
151
- node .addnode (addr , "onetry" )
151
+ # v2transport=False is used to avoid reconnections with v1 being scheduled. These could interfere with later checks.
152
+ node .addnode (addr , "onetry" , v2transport = False )
152
153
cmd = proxies [0 ].queue .get ()
153
154
assert isinstance (cmd , Socks5Command )
154
155
# Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6
@@ -164,7 +165,7 @@ def node_test(self, node, *, proxies, auth, test_onion, test_cjdns):
164
165
if self .have_ipv6 :
165
166
addr = "[1233:3432:2434:2343:3234:2345:6546:4534]:5443"
166
167
self .log .debug (f"Test: outgoing IPv6 connection through node { node .index } for address { addr } " )
167
- node .addnode (addr , "onetry" )
168
+ node .addnode (addr , "onetry" , v2transport = False )
168
169
cmd = proxies [1 ].queue .get ()
169
170
assert isinstance (cmd , Socks5Command )
170
171
# Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6
@@ -180,7 +181,7 @@ def node_test(self, node, *, proxies, auth, test_onion, test_cjdns):
180
181
if test_onion :
181
182
addr = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:8333"
182
183
self .log .debug (f"Test: outgoing onion connection through node { node .index } for address { addr } " )
183
- node .addnode (addr , "onetry" )
184
+ node .addnode (addr , "onetry" , v2transport = False )
184
185
cmd = proxies [2 ].queue .get ()
185
186
assert isinstance (cmd , Socks5Command )
186
187
assert_equal (cmd .atyp , AddressType .DOMAINNAME )
@@ -195,7 +196,7 @@ def node_test(self, node, *, proxies, auth, test_onion, test_cjdns):
195
196
if test_cjdns :
196
197
addr = "[fc00:1:2:3:4:5:6:7]:8888"
197
198
self .log .debug (f"Test: outgoing CJDNS connection through node { node .index } for address { addr } " )
198
- node .addnode (addr , "onetry" )
199
+ node .addnode (addr , "onetry" , v2transport = False )
199
200
cmd = proxies [1 ].queue .get ()
200
201
assert isinstance (cmd , Socks5Command )
201
202
assert_equal (cmd .atyp , AddressType .DOMAINNAME )
@@ -209,7 +210,7 @@ def node_test(self, node, *, proxies, auth, test_onion, test_cjdns):
209
210
210
211
addr = "node.noumenon:8333"
211
212
self .log .debug (f"Test: outgoing DNS name connection through node { node .index } for address { addr } " )
212
- node .addnode (addr , "onetry" )
213
+ node .addnode (addr , "onetry" , v2transport = False )
213
214
cmd = proxies [3 ].queue .get ()
214
215
assert isinstance (cmd , Socks5Command )
215
216
assert_equal (cmd .atyp , AddressType .DOMAINNAME )
0 commit comments