Page MenuHomePhabricator

scripted-diff: use self.sync_* methods
ClosedPublic

Authored by Fabien on Wed, May 20, 09:59.

Details

Summary

Completes backport of core PR15773. The remaining 2 commits cannot be
separated as it would cause flake8 to trigger failures.

Commit scripted-diff: use self.sync_* methods:
https://github.com/bitcoin/bitcoin/pull/15773/commits/fa16a09215f6cce23de0f90d51b3c5df37c6b6a4

-BEGIN VERIFY SCRIPT-
sed -i -e 's/sync_blocks(self.nodes)/self.sync_blocks()/g'     $(git grep -l 'sync_blocks(self.nodes)'   ./test/functional/*.py)
sed -i -e 's/sync_mempools(self.nodes)/self.sync_mempools()/g' $(git grep -l 'sync_mempools(self.nodes)' ./test/functional/*.py)

sed -i -e 's/  sync_blocks(/  self.sync_blocks(/g'     $(git grep -l sync_blocks   ./test/functional/*.py)
sed -i -e 's/  sync_mempools(/  self.sync_mempools(/g' $(git grep -l sync_mempools ./test/functional/*.py)
-END VERIFY SCRIPT-

Commit test: Remove unused imports:
https://github.com/bitcoin/bitcoin/pull/15773/commits/fafe5f0d09db6778173a1079d93c314e9317708c

For easier review one can just run the tests and the linter. The other
changes are copyright dates and import ordering fixes related to the
changes.

Depends on D6152.

Test Plan
ninja check-functional-extended

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Fabien created this revision.Wed, May 20, 09:59
Herald added a reviewer: Restricted Project. · View Herald TranscriptWed, May 20, 09:59
Fabien requested review of this revision.Wed, May 20, 09:59
teamcity edited the summary of this revision. (Show Details)Wed, May 20, 09:59

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

deadalnix edited the summary of this revision. (Show Details)Wed, May 20, 11:39
deadalnix edited the summary of this revision. (Show Details)
deadalnix accepted this revision.Wed, May 20, 11:51
This revision is now accepted and ready to land.Wed, May 20, 11:51
This revision was automatically updated to reflect the committed changes.