Page MenuHomePhabricator

[4 of 5] scripted-diff: Rename CBlockDiskPos to FlatFilePos.
ClosedPublic

Authored by markblundeberg on Jul 7 2019, 22:41.

Details

Summary

partial PR15118 backport
https://github.com/bitcoin/bitcoin/pull/15118/commits/65a489e93d181d3c0f7a9cf79f7c11ff8cf2b0f0

-BEGIN VERIFY SCRIPT-
sed -i 's/CDiskBlockPos/FlatFilePos/g' $(git ls-files 'src/*.h' 'src/*.cpp')
-END VERIFY SCRIPT-

Backport note: I simply re-ran the script, instead of merging the changes.

Depends on D3587

Test Plan

make check

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

markblundeberg created this revision.Jul 7 2019, 22:41
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 7 2019, 22:41

minor conflict from parent

jasonbcox requested changes to this revision.Jul 16 2019, 21:42

This is clearly missing at least one (if not more) backports. See ReadRawBlockFromDisk in the original PR.

This revision now requires changes to proceed.Jul 16 2019, 21:42

This is clearly missing at least one (if not more) backports. See ReadRawBlockFromDisk in the original PR.

Hmm, is that terribly important for scripted renames like this? It should be fairly obvious what to do when the ReadRawBlockFromDisk is backported later...

markblundeberg requested review of this revision.Jul 19 2019, 15:31
deadalnix accepted this revision.Jul 21 2019, 13:29

This is clearly missing at least one (if not more) backports. See ReadRawBlockFromDisk in the original PR.

Hmm, is that terribly important for scripted renames like this? It should be fairly obvious what to do when the ReadRawBlockFromDisk is backported later...

It is indeed not very relevant, but would make that backport easier.

jasonbcox accepted this revision.Aug 14 2019, 23:36
This revision is now accepted and ready to land.Aug 14 2019, 23:36