Page MenuHomePhabricator
Differential D3586

[2 of 5] validation: Extract basic block file logic into FlatFileSeq class.
ClosedPublic
Actions

Authored by markblundeberg on Jul 7 2019, 21:55.

Details

Reviewers
deadalnix
Fabien
jasonbcox
Group Reviewers
Restricted Project
Maniphest Tasks
T631: Backport PR 15118 "Refactor block file logic"
Commits
rSTAGING47756d0eea51: [2 of 5] validation: Extract basic block file logic into FlatFileSeq class.
rABC47756d0eea51: [2 of 5] validation: Extract basic block file logic into FlatFileSeq class.
Summary

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

This combines four refactor commits:
https://github.com/bitcoin/bitcoin/compare/9183d6ef6~1..e0380933e
...and a commit adding unit tests:
https://github.com/bitcoin/bitcoin/pull/15118/commits/4c01e4e159db82ce4b2acce75f709cac996367d7

These have been squashed due to intermediate commits not even building
properly. The tests have been modified to use CDiskBlockPos as the
rename is planned for a subsequent diff. Otherwise, it's the same.

Depends on D3579 D3583 D3584 D3585

Test Plan

make check

Diff Detail

Repository
rABC Bitcoin ABC
Branch
PR15118b
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 6770
Build 11587: Bitcoin ABC Buildbot (legacy)
Build 11586: arc lint + arc unit

Event Timeline

markblundeberg created this revision.Jul 7 2019, 21:55
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 7 2019, 21:55
teamcity added a comment.Jul 7 2019, 21:55

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

markblundeberg retitled this revision from [part 2 of 5] validation: Extract basic block file logic into FlatFileSeq class. to [2 of 5] validation: Extract basic block file logic into FlatFileSeq class..Jul 7 2019, 21:55
markblundeberg added a task: T631: Backport PR 15118 "Refactor block file logic".
teamcity added a comment.Jul 7 2019, 22:08

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6718: Diff 10063.Jul 7 2019, 22:08
markblundeberg planned changes to this revision.Jul 7 2019, 22:14
markblundeberg added inline comments.
src/Makefile.am
255 ↗(On Diff #10063)

oops, this needs to go in CMakeLists too

markblundeberg updated this revision to Diff 10064.Jul 7 2019, 22:17

CMakeLists

teamcity added a comment.Jul 7 2019, 22:18

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster failed remote builds in B6719: Diff 10064!Jul 7 2019, 22:23
teamcity added a comment.Jul 7 2019, 22:23

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

markblundeberg added a comment.Jul 7 2019, 22:29

CI failure from validation_block_tests, seems to be unrelated...

markblundeberg added a child revision: D3587: [3 of 5] Move CDiskBlockPos from chain to flatfile..Jul 7 2019, 22:31
teamcity added a comment.Jul 8 2019, 18:56

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Jul 8 2019, 19:06

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6719: Diff 10064.Jul 8 2019, 19:07
markblundeberg updated this revision to Diff 10149.Jul 9 2019, 18:54

rebase because all parents are landed

teamcity added a comment.Jul 9 2019, 18:55

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Jul 9 2019, 19:04

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6770: Diff 10149.Jul 9 2019, 19:04
jasonbcox requested changes to this revision.Jul 10 2019, 19:26

Looks good otherwise.

src/flatfile.cpp
24

brackets

75

comment on previous line

This revision now requires changes to proceed.Jul 10 2019, 19:26
markblundeberg updated this revision to Diff 10276.Jul 13 2019, 01:58

address nits

teamcity added a comment.Jul 13 2019, 01:58

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Jul 13 2019, 02:07

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

Harbormaster failed remote builds in B6848: Diff 10276!Jul 13 2019, 02:07
deadalnix accepted this revision.Jul 14 2019, 17:12
deadalnix added inline comments.
src/flatfile.cpp
5 ↗(On Diff #10276)

Standard lib include come last.

markblundeberg updated this revision to Diff 10305.Jul 15 2019, 22:17

for include order (and rebuild)

teamcity added a comment.Jul 15 2019, 22:17

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Jul 15 2019, 22:23

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6863: Diff 10305.Jul 15 2019, 22:23
jasonbcox accepted this revision.Jul 16 2019, 14:50
This revision is now accepted and ready to land.Jul 16 2019, 14:50
Closed by commit rABC47756d0eea51: [2 of 5] validation: Extract basic block file logic into FlatFileSeq class. (authored by jimpo, committed by Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com>). · Explain WhyJul 16 2019, 20:13
This revision was automatically updated to reflect the committed changes.
Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com> added a commit: rABC47756d0eea51: [2 of 5] validation: Extract basic block file logic into FlatFileSeq class..
Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com> added a commit: rSTAGING47756d0eea51: [2 of 5] validation: Extract basic block file logic into FlatFileSeq class..Sep 19 2019, 01:18

Revision Contents
Changeset List

PathSize
src/
1 line
2 lines
1 line
63 lines
90 lines
2 lines
test/
1 line
133 lines
2 lines
146 lines

Diff 10149

View Options

src/CMakeLists.txt

Loading...
View Options

src/Makefile.am

Loading...
View Options

src/Makefile.test.include

Loading...
View Options

src/flatfile.h

Loading...
View Options

src/flatfile.cpp

Loading...
View Options

src/init.cpp

Loading...
View Options

src/test/CMakeLists.txt

Loading...
View Options

src/test/flatfile_tests.cpp

Loading...
View Options

src/validation.h

Loading...
View Options

src/validation.cpp

Loading...