diff options
author | Carl Dong <contact@carldong.me> | 2020-08-25 16:40:21 -0400 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2021-01-28 14:15:26 -0500 |
commit | b026e318c39f59a06e29f1b25c7f577e01b25ccb (patch) | |
tree | f47575cf7c0ecbd69ae57817cc39a8b2f5fe02c2 /src/validation.h | |
parent | 3664a150ac7547c9336b571557af223d9e31aac9 (diff) | |
download | bitcoin-b026e318c39f59a06e29f1b25c7f577e01b25ccb.tar.xz |
validation: Move FindForkInGlobalIndex to BlockManager
[META] This commit should be followed up by removing the comments and
assertions meant only to show that the change is correct.
FindForkInGlobalIndex only acts on BlockManager.
Note to reviewers: Since FindForkInGlobalIndex is always called with
::ChainActive() as its first parameter, it is possible to move
FindForkInGlobalIndex to CChainState and remove this const CChain&
parameter to instead use m_chain. However, it seems like the original
intention was for FindForkInGlobalIndex to work with _any_ chain, not
just the current active chain. Let me know if this should be changed.
Diffstat (limited to 'src/validation.h')
-rw-r--r-- | src/validation.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/validation.h b/src/validation.h index e829c0c1c5..d8b6a65652 100644 --- a/src/validation.h +++ b/src/validation.h @@ -311,9 +311,6 @@ public: bool VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview, int nCheckLevel, int nCheckDepth); }; -/** Find the last common block between the parameter chain and a locator. */ -CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator) EXCLUSIVE_LOCKS_REQUIRED(cs_main); - enum DisconnectResult { DISCONNECT_OK, // All good. @@ -433,6 +430,9 @@ public: CBlockIndex* LookupBlockIndex(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main); + /** Find the last common block between the parameter chain and a locator. */ + CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator) EXCLUSIVE_LOCKS_REQUIRED(cs_main); + ~BlockManager() { Unload(); } |