Page MenuHomePhabricator

Resolved forgotten chain.h merge.

Authored by nakihito on Sep 4 2018, 22:29.


Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Restricted Project
rSTAGING5977efad639b: Resolved forgotten chain.h merge.
rABC5977efad639b: Resolved forgotten chain.h merge.

Continues work on T380, dependent on D1656. Fixes D1659. Removed CBlockStatus class from chain.h and placed into its own .h file, blockstatus.h. Updated other .h and .cpp files for dependencies.

Test Plan

make check

Diff Detail

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

Event Timeline

nakihito created this revision.Sep 4 2018, 22:29
Owners added a reviewer: Restricted Owners Package.Sep 4 2018, 22:29
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 4 2018, 22:29
jasonbcox requested changes to this revision.Sep 5 2018, 04:12
jasonbcox added inline comments.
598 ↗(On Diff #4762)

This is strange and shouldn't happen with clang-format-4.0. But I set you up with 4.0, so not sure what happened here. Please revert this.

This revision now requires changes to proceed.Sep 5 2018, 04:12
nakihito added inline comments.Sep 6 2018, 01:03
598 ↗(On Diff #4762)

I can change this back, but there are a similar couple of lines from 567-573 that looks more like this changed format than the previous format. In terms of consistency, I believe this change is correct, but am happy to revert to the previous.

nakihito updated this revision to Diff 4812.Sep 7 2018, 03:49

Fixed validation.cpp formatting error.

deadalnix accepted this revision.Sep 7 2018, 10:38
jasonbcox accepted this revision.Sep 7 2018, 14:12
This revision is now accepted and ready to land.Sep 7 2018, 14:12
This revision was automatically updated to reflect the committed changes.