refactor: move CCoinsViewErrorCatcher out of init.cpp #16355
Merged
Conversation
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
Contributor
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
maflcko
reviewed
Jul 8, 2019
Member
maflcko
left a comment
There was a problem hiding this comment.
ACK, just some dumb style nits and an erroneous include, I think. Feel free to ignore the nits.
afe7aff to
99ccdef
Compare
Contributor
Author
|
Took @MarcoFalke's patch and rebased. Thanks, Marco. |
99ccdef to
30de23d
Compare
Contributor
Author
|
Had to revert part of Marco's patch (see #16355 (comment)). |
Member
|
ACK 30de23d, mostly move-only moving CCoinsViewErrorCatcher out of init makes sense, so that e.g. a chainstate Show signature and timestampSignature: Timestamp of file with hash |
Contributor
|
ACK 30de23d Code changes make sense and I tested locally. |
ryanofsky
approved these changes
Jul 15, 2019
src/coins.h
Outdated
| public: | ||
| explicit CCoinsViewErrorCatcher(CCoinsView* view) : CCoinsViewBacked(view) {} | ||
|
|
||
| void AddReadErrCallback(const std::function<void()> f) { |
Contributor
There was a problem hiding this comment.
Should drop const, otherwise std::move below can't really have any effect.
Member
|
utACK. Could you fix up Rus's nit and this should be mergeable. |
and into coins.cpp. This move is necessary so that we can later include a CCoinsViewErrorCatcher instance under CChainState. Co-authored-by: MarcoFalke <falke.marco@gmail.com>
30de23d to
4f050b9
Compare
Contributor
Author
|
Thanks for the reviews and nudge. Pushed. |
Contributor
|
re-ACK 4f050b9 |
fanquake
added a commit
that referenced
this pull request
Jul 23, 2019
4f050b9 move-onlyish: move CCoinsViewErrorCatcher out of init.cpp (James O'Beirne) Pull request description: This is part of the [assumeutxo project](https://github.com/bitcoin/bitcoin/projects/11): Parent PR: #15606 Issue: #15605 Specification: https://github.com/jamesob/assumeutxo-docs/tree/2019-04-proposal/proposal --- This change moves `CCoinsViewErrorCatcher` out of `init` and into `coins` so that it can later be included in [a `CoinsView` instance](9128496#diff-349fbb003d5ae550a2e8fa658e475880R504) under `CChainState`. Instead of hardcoding read failure behavior that has knowledge of qt, it accepts error callbacks via `AddReadErrCallback()`. ACKs for top commit: dongcarl: re-ACK 4f050b9 ryanofsky: utACK 4f050b9. Only change since last review is fixing const. Tree-SHA512: eaba21606d15d2b8d0e3db7cec57779ce181af953db1ef4af80a0bc1dfb57923d0befde9d61b7be55c32224744f7fb6bd47d4e4c72f3ccfe6eaf0f4ae3765c17
deadalnix
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jun 18, 2020
Summary: 4f050b91c706181084b9288b8a87b7b637e4e4f7 move-onlyish: move CCoinsViewErrorCatcher out of init.cpp (James O'Beirne) Pull request description: This is part of the [assumeutxo project](https://github.com/bitcoin/bitcoin/projects/11): Parent PR: #15606 Issue: #15605 Specification: https://github.com/jamesob/assumeutxo-docs/tree/2019-04-proposal/proposal --- This change moves `CCoinsViewErrorCatcher` out of `init` and into `coins` so that it can later be included in [a `CoinsView` instance](bitcoin/bitcoin@9128496#diff-349fbb003d5ae550a2e8fa658e475880R504) under `CChainState`. Instead of hardcoding read failure behavior that has knowledge of qt, it accepts error callbacks via `AddReadErrCallback()`. ACKs for top commit: dongcarl: re-ACK 4f050b91c706181084b9288b8a87b7b637e4e4f7 ryanofsky: utACK 4f050b91c706181084b9288b8a87b7b637e4e4f7. Only change since last review is fixing const. Tree-SHA512: eaba21606d15d2b8d0e3db7cec57779ce181af953db1ef4af80a0bc1dfb57923d0befde9d61b7be55c32224744f7fb6bd47d4e4c72f3ccfe6eaf0f4ae3765c17 Backport of Core [[bitcoin/bitcoin#16355 | PR16355]] Test Plan: ninja ninja check-all src/bitcoind Verify normal start-up and operation. Reviewers: O1 Bitcoin ABC, #bitcoin_abc, Fabien Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D6634
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Oct 22, 2021
pravblockc
pushed a commit
to pravblockc/dash
that referenced
this pull request
Nov 18, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 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.
This is part of the assumeutxo project:
Parent PR: #15606
Issue: #15605
Specification: https://github.com/jamesob/assumeutxo-docs/tree/2019-04-proposal/proposal
This change moves
CCoinsViewErrorCatcherout ofinitand intocoinsso that it can later be included in aCoinsViewinstance underCChainState.Instead of hardcoding read failure behavior that has knowledge of qt, it accepts error callbacks via
AddReadErrCallback().