Resolved forgotten chain.h merge.
ClosedPublic
Actions

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

Details

Reviewers

jasonbcox
deadalnix
schancel

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Commits

rSTAGING5977efad639b: Resolved forgotten chain.h merge.
rABC5977efad639b: Resolved forgotten chain.h merge.

Summary

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

Repository

rABC Bitcoin ABC

Branch

SeperatingBlockStatusClassFix

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 3226
Build 4539: Bitcoin ABC Buildbot (legacy)
Build 4538: arc lint + arc unit

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

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

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

Harbormaster completed remote builds in B3193: Diff 4762.Sep 4 2018, 23:09

jasonbcox requested changes to this revision.Sep 5 2018, 04:12

jasonbcox added inline comments.

src/validation.cpp
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

src/validation.cpp
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.