diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-07 10:49:59 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-07 10:50:17 +0100 |
| commit | f0794cbd405636a7f528a60f2873050b865cf7e8 (patch) | |
| tree | 64e4780d749fcf6c18a88192b5253c48c6fa0406 /test | |
| parent | bb1383eb52502229cc6112f82f432c29f27a4e45 (diff) | |
| parent | 93fae5ae7c31fa1b1095770f00adeac1cfeda4b9 (diff) | |
Merge bitcoin/bitcoin#29822: test: remove immediate tx relay workaround in wallet_groups.py
93fae5ae7c31fa1b1095770f00adeac1cfeda4b9 test: remove immediate tx relay workaround in wallet_groups.py (Sebastian Falbesoner)
Pull request description:
Reverts commit ab4efad51b9ba276ffeb6871931e13772493f7cc (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 c985eb854cc86deb747caea5283c17cf51b6a983 (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 93fae5ae7c31fa1b1095770f00adeac1cfeda4b9
brunoerg:
utACK 93fae5ae7c31fa1b1095770f00adeac1cfeda4b9
Tree-SHA512: b949fd05b4308815ba02d0ee4d1318f642b930288dd03223f46db7db745177af1c070bc7058743ac27963c5ad90564089867cc12f31fee94812a16919c353bab
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/wallet_groups.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/functional/wallet_groups.py b/test/functional/wallet_groups.py index 3b407c285d..26477131cf 100755 --- a/test/functional/wallet_groups.py +++ b/test/functional/wallet_groups.py @@ -42,11 +42,6 @@ class WalletGroupTest(BitcoinTestFramework): 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) |