Skip to content

Conversation

@jtimon
Copy link
Contributor

@jtimon jtimon commented Apr 22, 2015

Right after #5975 is merged I would open this PR so I think it makes sense to open it already in case both things can be merged at once, and also to simplify #6051 dependecies.

Note that this is no longer depedendent on #5696 nor #5669

@jtimon jtimon changed the title MOVEONLY: Move most consensus function declarations to consensus/consensus.h MOVEONLY: Move most block header validation function defintions to consensus/blockverify.cpp Apr 22, 2015
@jtimon jtimon changed the title MOVEONLY: Move most block header validation function defintions to consensus/blockverify.cpp DEPENDENT: MOVEONLY: Move most block header validation function defintions to consensus/blockverify.cpp Apr 22, 2015
@jtimon
Copy link
Contributor Author

jtimon commented Apr 23, 2015

Closing until #5696 is resolved

@jtimon jtimon closed this Apr 23, 2015
@jtimon jtimon reopened this Apr 23, 2015
@jtimon jtimon force-pushed the consensus_header0 branch from 5505a8a to 502f337 Compare April 23, 2015 13:02
@jtimon jtimon closed this Apr 23, 2015
@jtimon jtimon reopened this Apr 24, 2015
@jtimon jtimon force-pushed the consensus_header0 branch from 502f337 to 699f550 Compare April 24, 2015 22:24
@jtimon jtimon changed the title DEPENDENT: MOVEONLY: Move most block header validation function defintions to consensus/blockverify.cpp MOVEONLY: Move most block header validation function defintions to consensus/blockverify.cpp Apr 24, 2015
@jtimon jtimon changed the title MOVEONLY: Move most block header validation function defintions to consensus/blockverify.cpp MOVEONLY-ish: Move most block header validation function defintions to consensus/blockverify.cpp Apr 24, 2015
@jtimon
Copy link
Contributor Author

jtimon commented Apr 24, 2015

Reopened as independent from #5696

@theuni
Copy link
Member

theuni commented Apr 24, 2015

NACK. Why?

#5696 has several ACKs and is likely to be merged very quickly. Those changes have gone through half a dozen iterations, but never been merged because they're constantly moving in and out of PRs. Now you've tacked it on to something else that will need more review, essentially putting the brakes on it again. Worse yet, it fails to build.

Please, just wait for one chunk at a time. This is getting out of hand.

(declarations to consensus/consensus.h)

from main.cpp:
-CheckBlockHeader
-ContextualCheckBlockHeader
-IsSuperMajority

from pow.cpp:
-CalculateNextWorkRequired
-CheckProofOfWork
-GetNextWorkRequired
@jtimon jtimon force-pushed the consensus_header0 branch from 699f550 to 0d486be Compare April 25, 2015 08:41
@jtimon
Copy link
Contributor Author

jtimon commented Apr 25, 2015

I'm sorry, I just wanted to show that this (and everything necessary to expose VerifyHeader) is independent from #5696, from whether MANDATORY_SCRIPT_VERIFY_FLAGS is consensus, policy, or none of them. And if the includes in #5696 (not so many now that the policy stuff is left out) trigger a rebase (like they have done many times before), this could still not need rebase and have an older commit ID the replacement of jtimon@691161d.
I also wanted to show additional motivation for #5975 (or maybe merge both together, it's not that big of a change), for example, to support the argument for merging #5975 before #6055.

About the building error, I don't know why forgetting .h files in the makefile doesn't fail in my computer, but fixed.

Anyway, even if it's independent from #5696, merging one would trigger a trivial rebase on the other, so closing until #5696 and #5975.

@sipa
Copy link
Member

sipa commented Apr 25, 2015 via email

@jtimon
Copy link
Contributor Author

jtimon commented Apr 25, 2015

Thank you @sipa . Oh, I forgot to actually close the PR

@jtimon jtimon closed this Apr 25, 2015
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants