Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#29822: test: remove immediate tx relay workarou…
Browse files Browse the repository at this point in the history
…nd 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
  • Loading branch information
fanquake committed Apr 7, 2024
2 parents bb1383e + 93fae5a commit f0794cb
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions test/functional/wallet_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ def skip_test_if_missing_module(self):

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

Expand Down

0 comments on commit f0794cb

Please sign in to comment.