Page MenuHomePhabricator

[backport#16898] scripted-diff: test: Replace connect_nodes_bi with connect_nodes
ClosedPublic

Authored by majcosta on Jun 9 2020, 20:36.

Details

Summary

-BEGIN VERIFY SCRIPT-
sed -i --regexp-extended -e 's/connect_nodes_bi\(self.nodes,\s*(.),\s*/connect_nodes(self.nodes[\1], /g' $(git grep -l connect_nodes_bi)
sed -i --regexp-extended -e 's/connect_nodes_bi(,| )/connect_nodes\1/g' $(git grep -l connect_nodes_bi)
sed -i -- 's/connect_nodes_bi/connect_nodes/g' $(git grep -l connect_nodes_bi)
git restore test/functional/test_framework/util.py
-END VERIFY SCRIPT-

(script doesn't match our connect_nodes's API)

https://github.com/bitcoin/bitcoin/pull/16898/commits/fa3b9ee8b2280af4bcbcfffff275aaf8dd125929


Depends on D6490

Partial backport of Core PR16898

Test Plan
ninja check-all

Diff Detail

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

Event Timeline

majcosta requested review of this revision.Jun 9 2020, 20:36

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

jasonbcox added a subscriber: jasonbcox.

As is, the change looks good. But please look into out-of-order backports in these files that will likely be a headache for others:

  • rpc_psbt.py
  • wallet_avoidreuse.py
  • wallet_keypool_topup.py
This revision is now accepted and ready to land.Jun 9 2020, 22:39