Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: scripted-diff cleanups after generate* changes #23474

Merged
merged 4 commits into from
Nov 16, 2021

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 9, 2021

Some cleanups after commit 94db963

@DrahtBot DrahtBot added the Tests label Nov 9, 2021
@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 10, 2021

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #23365 (index: Fix backwards search for bestblock by mzumsande)
  • #23127 (tests: Use test framework utils where possible by vincenzopalazzo)
  • #23075 (refactoring: Fee estimation functional test cleanups by darosior)
  • #22364 (wallet: Make a tr() descriptor by default by achow101)
  • #21726 (Improve Indices on pruned nodes via prune blockers by fjahr)
  • #21283 (Implement BIP 370 PSBTv2 by achow101)
  • #10102 (Multiprocess bitcoin by ryanofsky)

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.

@fanquake
Copy link
Member

Concept ACK

MarcoFalke added 3 commits November 10, 2021 11:09
The sync calls are redundant after a call to generate, because generate
already syncs itself.

-BEGIN VERIFY SCRIPT-
perl -0777 -pi -e 's/(generate[^\n]*\)[^\n]*)(\n|\s)+self.sync_(all|blocks)\([^\)]*\)\n/\1\n/g' $(git grep -l generate ./test)
-END VERIFY SCRIPT-
The previous diff touched most files in ./test/, so bump the headers to
avoid having to touch them again for a bump later.

-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./test/
-END VERIFY SCRIPT-
@theStack
Copy link
Contributor

Concept ACK

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK fac23c2

@fanquake fanquake merged commit ffdab41 into bitcoin:master Nov 16, 2021
@maflcko maflcko deleted the 2107-testSync branch November 16, 2021 08:40
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Nov 16, 2021
@bitcoin bitcoin locked and limited conversation to collaborators Nov 17, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants