Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mrs Peacock in The Library with The Candlestick (killed main.{h,cpp}) #1872

Merged
merged 6 commits into from
Sep 30, 2020

Conversation

random-zebra
Copy link

@random-zebra random-zebra commented Sep 25, 2020

Finally split main.{h,cpp} file in net_processing.{h,cpp}/validation.{h,cpp} as per upstream (bitcoin#9260) 🎉

Built on top of

@random-zebra random-zebra added this to the 5.0.0 milestone Sep 25, 2020
@random-zebra random-zebra self-assigned this Sep 25, 2020
@random-zebra random-zebra force-pushed the 202009_mainsplit branch 3 times, most recently from 2d7de4a to 80e4c05 Compare September 26, 2020 09:13
@random-zebra
Copy link
Author

Rebased on master. Ready for review.

TheBlueMatt and others added 6 commits September 28, 2020 13:26
As orphan state is now "network state", like in
d6ea737,

UnloadBlockIndex is only used during init if we end up reindexing
to clear our block state so that we can start over. However, at
that time no connections have been brought up as CConnman hasn't
been started yet, so all of the network processing state logic is
empty when its called.
add extern declaration for now. cs_main will be removed from here.

(Also fix AcceptBlockHeader method signature).
@random-zebra
Copy link
Author

Rebased again.

Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 34ad9d5

Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two small comments, otherwise ACK

src/main.cpp Show resolved Hide resolved
src/net_processing.cpp Show resolved Hide resolved
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 34ad9d5 with a minor nit.

src/net_processing.cpp Show resolved Hide resolved
@furszy furszy merged commit 2f4e1ca into PIVX-Project:master Sep 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants