Page MenuHomePhabricator
Differential D10558

test: Replace use of (dis)?connect_nodes globals
ClosedPublic
Actions

Authored by PiRK on Nov 26 2021, 13:35.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC572f52819dc9: test: Replace use of (dis)?connect_nodes globals
Summary

This is a 3 commit PR that replaces all uses of util.(dis)?connect_nodes with TestFramework.(dis)?connect_nodes. This reduces the number of imports by a lot and leave only one single way of doing this operation.

A later scripted-diff commit replaces the majority of uses, which all
follow this pattern:

`(dis)?connect_nodes(self.nodes[a], self.nodes[b]))`

This commit replaces the few "special cases".

This is a backport of core#19667 [1/3]
https://github.com/bitcoin/bitcoin/pull/19967/commits/be386840d4a394a1b6221fb7d0fa2b0bc4b1d413

The line touched in rpc_psbt is in a segwit related test that does not exist in Bitcoin ABC.

Test Plan

ninja check-functional

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

PiRK created this revision.Nov 26 2021, 13:35
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 26 2021, 13:35
PiRK requested review of this revision.Nov 26 2021, 13:35
teamcity edited the summary of this revision. (Show Details)Nov 26 2021, 13:36
PiRK updated this revision to Diff 31069.Nov 26 2021, 13:45

use node.index instead of a literal int, when available

Harbormaster completed remote builds in B17391: Diff 31066.Nov 26 2021, 13:47
PiRK updated this revision to Diff 31070.Nov 26 2021, 13:51

simplify abc_p2p_proof_inventory: enumerate is not needed when using node.index

PiRK added a child revision: D10560: test: Move (dis)?connect_nodes globals into TestFramework.Nov 26 2021, 13:54
Harbormaster completed remote builds in B17394: Diff 31069.Nov 26 2021, 14:05
Harbormaster completed remote builds in B17395: Diff 31070.Nov 26 2021, 14:07
Fabien accepted this revision.Nov 29 2021, 08:30
This revision is now accepted and ready to land.Nov 29 2021, 08:30
Closed by commit rABC572f52819dc9: test: Replace use of (dis)?connect_nodes globals (authored by Elliott Jin <elliott.jin@gmail.com>, committed by PiRK). · Explain WhyNov 29 2021, 13:06
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC572f52819dc9: test: Replace use of (dis)?connect_nodes globals.

Revision Contents
Changeset List

Diff 31134

View Options

test/functional/abc-parkedchain.py

Loading...
View Options

test/functional/abc_p2p_proof_inventory.py

Loading...
View Options

test/functional/abc_rpc_avalancheproof.py

Loading...
View Options

test/functional/mempool_unbroadcast.py

Loading...