Split logic to undo txin's off DisconnectBlock.#5699
Merged
laanwj merged 1 commit intobitcoin:masterfrom Feb 9, 2015
Merged
Conversation
Member
|
@sipa Care to re-review this? |
domob1812
force-pushed
the
btc-txinundo
branch
from
635a6fd to
ff56c9c
Compare
Contributor
Author
|
Rebased. Can this be merged, or is there anything I still have to do? |
Contributor
|
utACK |
Member
There was a problem hiding this comment.
Change the DisconnectBlock() to ApplyTxInUndo() (or even better, replace it with %s: with FILE).
Member
|
utACK apart from the above nit |
domob1812
force-pushed
the
btc-txinundo
branch
from
ff56c9c to
27ce72b
Compare
Instead, create a separate function that applies the undo operation of a CTxInUndo object onto a CCoinsViewCache. This method is used from DisconnectBlock.
domob1812
force-pushed
the
btc-txinundo
branch
from
27ce72b to
eb1c2cd
Compare
Contributor
Author
|
Fixed the nit. |
Member
|
ACK, verfied code moves only apart from some error() message changes. |
laanwj
added a commit
that referenced
this pull request
Feb 9, 2015
eb1c2cd Split logic to undo txin's off DisconnectBlock. (Daniel Kraft)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Instead, create a separate function that applies the undo operation of a CTxInUndo object onto a CCoinsViewCache. This method is used from DisconnectBlock.
This is a rebased version of #5192. I had to re-submit it, since the old pull request does no longer pick up changes. The reason for that is that namecoin/namecoin was changed to be no longer a fork of bitcoin/bitcoin, and the old pull request was done via domob1812/namecoin (forked from namecoin/namecoin).