Skip to content

Move CMerkleBlock and CPartialMerkleTree to their own file#5181

Merged
laanwj merged 1 commit intobitcoin:masterfrom
TheBlueMatt:merklesplit
Dec 5, 2014
Merged

Move CMerkleBlock and CPartialMerkleTree to their own file#5181
laanwj merged 1 commit intobitcoin:masterfrom
TheBlueMatt:merklesplit

Conversation

@TheBlueMatt
Copy link
Copy Markdown
Contributor

@TheBlueMatt TheBlueMatt commented Oct 30, 2014

Code move only.

theuni
theuni reviewed Oct 31, 2014
View reviewed changes
src/merkleblock.cpp Outdated
Copy link
Copy Markdown
Member

@theuni theuni Oct 31, 2014

Choose a reason for hiding this comment

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

Can we move out of main instead of duplicating it? Other files need this too and could drop their dependency on main.h (bitcoin-tx.cpp for ex).

Copy link
Copy Markdown
Contributor Author

@TheBlueMatt TheBlueMatt Oct 31, 2014

Choose a reason for hiding this comment

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

Oops, that was a test, didnt mean to leave that duplication in there...anyway, yea, it should be moved out.

@theuni
Copy link
Copy Markdown
Member

theuni commented Oct 31, 2014

Verified move-only other than the necessary header changes and the MAX_BLOCK_SIZE change I nagged about.

Diapolo
Diapolo reviewed Oct 31, 2014
View reviewed changes
src/merkleblock.h Outdated
Copy link
Copy Markdown

@Diapolo Diapolo Oct 31, 2014

Choose a reason for hiding this comment

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

Can you keep the header include and ordering policy please.

@TheBlueMatt
Copy link
Copy Markdown
Contributor Author

TheBlueMatt commented Nov 2, 2014

I moved MAX_BLOCK_SIZE to core/block.h, though in a separate commit, merger can chose to include that or not based on random coin flip (as long as its fair based on bitcoin block hashes).

@TheBlueMatt TheBlueMatt mentioned this pull request Nov 3, 2014
Merged
@sipa
Copy link
Copy Markdown
Member

sipa commented Nov 3, 2014

utACK, and verified e057989f92af63ef336f6620ebe77ea8c9255f9a move-only.

@TheBlueMatt
Copy link
Copy Markdown
Contributor Author

TheBlueMatt commented Dec 5, 2014

Rebased, squashed.

@laanwj
Copy link
Copy Markdown
Member

laanwj commented Dec 5, 2014

Oh this moves things out of main.cpp/h. That's nice!
ACK verified move-only
commithash afd4b94
(signature)

@laanwj laanwj added this to the 0.10.0 milestone Dec 5, 2014
@laanwj laanwj merged commit afd4b94 into bitcoin:master Dec 5, 2014
laanwj added a commit that referenced this pull request Dec 5, 2014
@laanwj
Merge pull request #5181
b5fa132 
afd4b94 Move CMerkleBlock and CPartialMerkleTree to their own file (Matt Corallo)
@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.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.10.0

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt @theuni @sipa @laanwj @Diapolo