highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

node/chainstate: Decouple from GetTime

Browse Source 
...instead pass in a std::function<int64_t()>

Note that the static_cast is needed (apparently) for the compiler to
know which overloaded GetTime to choose.
This commit is contained in:
Carl Dong
2021-09-22 15:36:10 -04:00
parent 2414ebc18b
commit 05441c2dc5
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/init.cpp
View File

@@ -1487,7 +1487,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
fReindexChainState, fReindexChainState,
chainparams, chainparams,
check_blocks, check_blocks,
args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL)); args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL),
static_cast<int64_t(*)()>(GetTime));
} catch (const std::exception& e) { } catch (const std::exception& e) {
LogPrintf("%s\n", e.what()); LogPrintf("%s\n", e.what());
rv2 = ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE; rv2 = ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE;

6
src/node/chainstate.cpp
View File

@@ -5,7 +5,6 @@
#include <node/chainstate.h> #include <node/chainstate.h>
#include <chainparams.h> // for CChainParams #include <chainparams.h> // for CChainParams
#include <util/time.h> // for GetTime
#include <node/blockstorage.h> // for CleanupBlockRevFiles, fHavePruned, fReindex #include <node/blockstorage.h> // for CleanupBlockRevFiles, fHavePruned, fReindex
#include <shutdown.h> // for ShutdownRequested #include <shutdown.h> // for ShutdownRequested
#include <validation.h> // for a lot of things #include <validation.h> // for a lot of things
@@ -131,7 +130,8 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
bool fReindexChainState, bool fReindexChainState,
const CChainParams& chainparams, const CChainParams& chainparams,
unsigned int check_blocks, unsigned int check_blocks,
unsigned int check_level) unsigned int check_level,
std::function<int64_t()> get_unix_time_seconds)
{ {
auto is_coinsview_empty = [&](CChainState* chainstate) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { auto is_coinsview_empty = [&](CChainState* chainstate) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull(); return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull();
@@ -143,7 +143,7 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
for (CChainState* chainstate : chainman.GetAll()) { for (CChainState* chainstate : chainman.GetAll()) {
if (!is_coinsview_empty(chainstate)) { if (!is_coinsview_empty(chainstate)) {
const CBlockIndex* tip = chainstate->m_chain.Tip(); const CBlockIndex* tip = chainstate->m_chain.Tip();
if (tip && tip->nTime > GetTime() + MAX_FUTURE_BLOCK_TIME) { if (tip && tip->nTime > get_unix_time_seconds() + 2 * 60 * 60) {
return ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE; return ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE;
} }

3
src/node/chainstate.h
View File

@@ -74,6 +74,7 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
bool fReindexChainState, bool fReindexChainState,
const CChainParams& chainparams, const CChainParams& chainparams,
unsigned int check_blocks, unsigned int check_blocks,
unsigned int check_level); unsigned int check_level,
std::function<int64_t()> get_unix_time_seconds);
#endif // BITCOIN_NODE_CHAINSTATE_H #endif // BITCOIN_NODE_CHAINSTATE_H