Skip to content

Conversation

@jtimon
Copy link
Contributor

@jtimon jtimon commented Oct 21, 2014

Built on top of #5100.
coins.o doesn't need to depend on undo.h (Decouple CCoins from CTxInUndo)
miner.o neither (Decouple miner.o from CTxUndo)
Finally, CBlockUndo can be moved from main.h to undo.h if it is first decoupled from CDiskBlockPos.

@jtimon jtimon force-pushed the core2 branch 2 times, most recently from 13a7453 to da94974 Compare October 27, 2014 13:06
@jtimon jtimon changed the title Decouple CCoins from CTxInUndo Only include undo.h from main.cpp Oct 27, 2014
@jtimon
Copy link
Contributor Author

jtimon commented Oct 28, 2014

Rebased to make it more readable.

@sipa
Copy link
Member

sipa commented Oct 29, 2014

utACK!

@jtimon
Copy link
Contributor Author

jtimon commented Oct 30, 2014

Nits addressed.

@sipa sipa mentioned this pull request Nov 1, 2014
@sipa
Copy link
Member

sipa commented Nov 4, 2014

Needs rebase.

@jtimon
Copy link
Contributor Author

jtimon commented Nov 5, 2014

Rebased and squashed the commits solving the nits.

@sipa
Copy link
Member

sipa commented Nov 18, 2014

utACK still

@jtimon
Copy link
Contributor Author

jtimon commented Nov 21, 2014

Needed rebase for the doxygen comments.

@jtimon
Copy link
Contributor Author

jtimon commented Dec 2, 2014

Rebased adding @theuni 's suggestions.

src/main.cpp Outdated
Copy link
Member

Choose a reason for hiding this comment

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

This part was removed in head.

@jtimon
Copy link
Contributor Author

jtimon commented Dec 2, 2014

Sorry, mistake rebasing...

@jtimon
Copy link
Contributor Author

jtimon commented Dec 9, 2014

Rebased

@jtimon
Copy link
Contributor Author

jtimon commented Dec 27, 2014

Rebased again.
Like miner.cpp, txmempool.cpp was now also unnecessarily coupled with CTxUndo.

@jgarzik
Copy link
Contributor

jgarzik commented Dec 31, 2014

ACK

@jgarzik jgarzik merged commit 87fb310 into bitcoin:master Dec 31, 2014
jgarzik pushed a commit that referenced this pull request Dec 31, 2014
branch 'core2' of git://github.com/jtimon/bitcoin into merge-5111
furszy added a commit to PIVX-Project/PIVX that referenced this pull request Jul 16, 2020
9670a84 Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace (random-zebra)
4fe609f Decouple CBlockUndo from CDiskBlockPos (jtimon)
9703b0e Decouple miner.o and txmempool.o from CTxUndo (random-zebra)
cdc8cdc Decouple CCoins from CTxInUndo (jtimon)

Pull request description:

  Backport bitcoin#5111

  Original description:
  > Built on top of bitcoin#5100.
  > coins.o doesn't need to depend on undo.h (Decouple CCoins from CTxInUndo)
  > miner.o neither (Decouple miner.o from CTxUndo)
  > Finally, CBlockUndo can be moved from main.h to undo.h if it is first decoupled from CDiskBlockPos.

ACKs for top commit:
  furszy:
    utACK 9670a84
  Fuzzbawls:
    re-utACK 9670a84

Tree-SHA512: d77110525f50a3085013ca9cb87550ff786ee06c5b938a9002fe3a434c7a35a425238d1b623a01c26bebb5075c7e1bea9bc2ff4638c0c1190df15196b7097e55
@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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants