Skip to content

Commit f0794cb

Browse files
committed
Merge bitcoin/bitcoin#29822: test: remove immediate tx relay workaround in wallet_groups.py
93fae5a test: remove immediate tx relay workaround in wallet_groups.py (Sebastian Falbesoner) Pull request description: Reverts commit ab4efad (PR #26970). This workaround is not needed anymore, as since #27114 the test sets the noban permission for both in- and outbound connections via the `noban_tx_relay` setting, and we don't have to rely on this topology hack anymore. See commit c985eb8 (kudos to brunoerg!). Can be tested by executing `$ time ./test/functional/wallet_groups.py` both on master and PR and verifying that the execution time is roughly equal. ACKs for top commit: maflcko: lgtm ACK 93fae5a brunoerg: utACK 93fae5a Tree-SHA512: b949fd05b4308815ba02d0ee4d1318f642b930288dd03223f46db7db745177af1c070bc7058743ac27963c5ad90564089867cc12f31fee94812a16919c353bab
2 parents bb1383e + 93fae5a commit f0794cb

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

test/functional/wallet_groups.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ def skip_test_if_missing_module(self):
4242

4343
def run_test(self):
4444
self.log.info("Setting up")
45-
# To take full use of immediate tx relay, all nodes need to be reachable
46-
# via inbound peers, i.e. connect first to last to close the circle
47-
# (the default test network topology looks like this:
48-
# node0 <-- node1 <-- node2 <-- node3 <-- node4 <-- node5)
49-
self.connect_nodes(0, self.num_nodes - 1)
5045
# Mine some coins
5146
self.generate(self.nodes[0], COINBASE_MATURITY + 1)
5247

0 commit comments

Comments
 (0)