scripted-diff: Use generate* from TestFramework #22788

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2108-testGenDiff changing 117 files +468 −468

MarcoFalke commented at 8:36 AM on August 24, 2021: member

This is needed for #22567.

By using the newly added generate* member functions of the test framework, it paves the way to make it easier to implicitly call sync_all after block generation to avoid intermittent issues.
DrahtBot added the label Refactoring on Aug 24, 2021
lsilva01 approved
lsilva01 commented at 12:36 AM on August 25, 2021: contributor

Tested ACK https://github.com/bitcoin/bitcoin/pull/22788/commits/fac89376b99b606af3b2bf4629ad247be918411c on Ubuntu 20.04
DrahtBot commented at 4:45 AM on August 25, 2021: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #22674 (validation: mempool validation and submission for packages of 1 child + parents by glozow)
- #22650 (Remove -deprecatedrpc=addresses flag and corresponding code/logic by mjdietzx)
- #22509 (test: Use MiniWallet in mempool_accept.py by sriramdvt)
- #22290 (Package Mempool Submission with Package Fee-Bumping by glozow)
- #21726 (Improve Indices on pruned nodes via prune blockers by fjahr)
- #19888 (rpc, test: Improve getblockstats for unspendables by fjahr)
- #17526 (Add Single Random Draw as an additional coin selection algorithm by achow101)
- #15129 (rpc: Added ability to remove watch only addresses by benthecarman)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
DrahtBot added the label Needs rebase on Aug 27, 2021
MarcoFalke force-pushed on Aug 27, 2021
DrahtBot removed the label Needs rebase on Aug 27, 2021
DrahtBot added the label Needs rebase on Sep 1, 2021
jonatack commented at 6:03 PM on September 1, 2021: member

I guess I'm the cause of the rebase, will review to move this forward.

scripted-diff: Use generate* from TestFramework

-BEGIN VERIFY SCRIPT-
 sed --regexp-extended -i \
     's/((self\.)?(nodes\[[^]]+\]|[a-z_]*(wallet|node)[0-9a-z_]*))\.(generate(|toaddress|block|todescriptor)(\(|, ))/self.\5\1, /g' \
     $(git grep -l generate ./test | grep -v 'test_framework/' | grep -v 'feature_rbf')
-END VERIFY SCRIPT-

fa0b916971

MarcoFalke force-pushed on Sep 2, 2021
MarcoFalke commented at 8:35 AM on September 2, 2021: member

Rebased (trivial, because scripted-diff)
DrahtBot removed the label Needs rebase on Sep 2, 2021
practicalswift commented at 1:56 PM on September 4, 2021: contributor

Concept ACK

jonatack commented at 3:24 PM on September 4, 2021: member

ACK fa0b916971e5bc23ad6396831940a2899ca05402

$ test/lint/commit-script-check.sh f4e12fd..fa0b916
Running script for: fa0b916971e5bc23ad6396831940a2899ca05402
 sed --regexp-extended -i \
     's/((self\.)?(nodes\[[^]]+\]|[a-z_]*(wallet|node)[0-9a-z_]*))\.(generate(|toaddress|block|todescriptor)(\(|, ))/self., /g' \
     $(git grep -l generate ./test | grep -v 'test_framework/' | grep -v 'feature_rbf')
OK

Maybe update the pull description to s/needed for/the first commit of/ #22567.

MarcoFalke merged this on Sep 9, 2021
MarcoFalke closed this on Sep 9, 2021
MarcoFalke deleted the branch on Sep 9, 2021
sidhujag referenced this in commit 88d6e926bf on Sep 11, 2021
DrahtBot locked this on Oct 30, 2022

Contributors

Labels

Linked (view graph)

#22567 test: Implicitly sync after generate* to preempt races and intermittent test failures

scripted-diff: Use generate* from TestFramework #22788

Conflicts