diff options
author | Ryan Ofsky <ryan@ofsky.org> | 2022-01-17 18:36:40 -0500 |
---|---|---|
committer | Ryan Ofsky <ryan@ofsky.org> | 2022-07-18 13:39:55 -0500 |
commit | bef4e405f3de2718dfee279a9abff4daf016da26 (patch) | |
tree | 52a53b50ad0da1ae8dcf59dc1a0ef174df1381e8 /src/index/base.cpp | |
parent | addb4f2af183a25ce4a6b6485b5b49575a2ba31b (diff) | |
download | bitcoin-bef4e405f3de2718dfee279a9abff4daf016da26.tar.xz |
indexes, refactor: Remove CBlockIndex* uses in index Init methods
Replace overriden index Init() methods that use the best block
CBlockIndex* pointer with pure CustomInit() callbacks that are passed
the block hash and height.
This gets rid of more CBlockIndex* pointer uses so indexes can work
outside the bitcoin-node process. It also simplifies the initialization
call sequence so index implementations are not responsible for
initializing the base class.
There is a slight change in behavior here since now the best block
pointer is loaded and checked before the custom index init functions are
called instead of while they are called.
Diffstat (limited to 'src/index/base.cpp')
-rw-r--r-- | src/index/base.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/index/base.cpp b/src/index/base.cpp index 26b3653f7b..1b861df4bf 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -359,7 +359,10 @@ bool BaseIndex::Start() // Need to register this ValidationInterface before running Init(), so that // callbacks are not missed if Init sets m_synced to true. RegisterValidationInterface(this); - if (!Init()) { + if (!Init()) return false; + + const CBlockIndex* index = m_best_block_index.load(); + if (!CustomInit(index ? std::make_optional(interfaces::BlockKey{index->GetBlockHash(), index->nHeight}) : std::nullopt)) { return false; } |