Skip to content

Commit 2ac41ef

Browse files
committed
Merge bitcoin#29460: test: assert rpc error for addnode v2transport not enabled
345169a test: assert rpc error for addnode v2transport not enabled (kevkevin) Pull request description: Added coverage for the `addnode` rpc when v2transport is not enabled, but is set as true when calling `addnode` rpc. I ran the following to check if this rpc error message was covered in the functional tests. `grep -nr "v2transport requested but not enabled" ./test/functional --binary-files=without-match` Adds test coverage to this line. https://github.com/bitcoin/bitcoin/blob/master/src/rpc/net.cpp#L339 ACKs for top commit: maflcko: lgtm ACK 345169a brunoerg: utACK 345169a BrandonOdiwuor: Code Review ACK 345169a theStack: Code-review ACK 345169a Tree-SHA512: fb82409485efe25a1193b1dafca8ae694b397a301bb8bcb33c7572d21ff244ee45fbbd4364141e9421733873b343554a34614a59b1450ce0cac5c420203c3d35
2 parents 46d2616 + 345169a commit 2ac41ef

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Diff for: test/functional/p2p_v2_transport.py

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from test_framework.util import (
1313
assert_equal,
1414
p2p_port,
15+
assert_raises_rpc_error
1516
)
1617

1718

@@ -59,6 +60,11 @@ def run_test(self):
5960
# V1 nodes can sync with each other
6061
assert_equal(self.nodes[2].getblockcount(), 0)
6162
assert_equal(self.nodes[3].getblockcount(), 0)
63+
64+
# addnode rpc error when v2transport requested but not enabled
65+
ip_port = "127.0.0.1:{}".format(p2p_port(3))
66+
assert_raises_rpc_error(-8, "Error: v2transport requested but not enabled (see -v2transport)", self.nodes[2].addnode, node=ip_port, command='add', v2transport=True)
67+
6268
with self.nodes[2].assert_debug_log(expected_msgs=[],
6369
unexpected_msgs=[sending_handshake, downgrading_to_v1]):
6470
self.connect_nodes(2, 3, peer_advertises_v2=False)

0 commit comments

Comments
 (0)