mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 15:09:59 +01:00
Merge bitcoin/bitcoin#23280: init: Coalesce Chainstate loading sequence between {,non-}unittest codepaths
7f15eff2ddstyle-only: Remove redundant scope in *Chainstate (Carl Dong)89bec827fdCollapse the 2 cs_main locks in LoadChainstate (Carl Dong)3b1584b794Remove all #include // for * comments (Carl Dong)9a5a5a3d08test/setup: Use LoadChainstate (Carl Dong)c541da0d62node/chainstate: Add options for in-memory DBs (Carl Dong)ceb9790341node/caches: Remove intermediate variables (Carl Dong)ac4bf138b8node/caches: Extract cache calculation logic (Carl Dong)15f2e33bb3validation: VerifyDB only needs Consensus::Params (Carl Dong)4da9c076d1node/chainstate: Decouple from ShutdownRequested (Carl Dong)05441c2dc5node/chainstate: Decouple from GetTime (Carl Dong)2414ebc18binit: Delay RPC block notif until warmup finished (Carl Dong)8d466a8504Move -checkblocks LogPrintf to AppInitMain (Carl Dong)aad8d59789node/chainstate: Reduce coupling of LogPrintf (Carl Dong)b345979a2bnode/chainstate: Decouple from concept of uiInterface (Carl Dong)ca7c0b934dSplit off VerifyLoadedChainstate (Carl Dong)adf4912d77node/chainstate: Remove do/while loop (Carl Dong)975235ca0aMove init logistics message for BAD_GENESIS_BLOCK to init.cpp (Carl Dong)8715658983Move mempool nullptr Assert out of LoadChainstate (Carl Dong)9162a4f93enode/chainstate: Decouple from concept of NodeContext (Carl Dong)c7a5c46e6fnode/chainstate: Decouple from ArgsManager (Carl Dong)ae9121f958node/chainstate: Decouple from stringy errors (Carl Dong)cbac28b72fnode/chainstate: Decouple from GetTimeMillis (Carl Dong)cb64af9635node: Extract chainstate loading sequence (Carl Dong) Pull request description: This PR: 1. Coalesce the Chainstate loading sequence between `AppInitMain` and `*TestingSetup` (which makes it more tested) 2. Makes the Chainstate loading sequence reusable in preparation for future work extracting out our consensus engine. Code-wise, this PR: 1. Extracts `AppInitMain`'s Chainstate loading sequence into a `::LoadChainstateSequence` function 2. Makes this `::LoadChainstateSequence` function reusable by 1. Decoupling it from various concepts (`ArgsManager`, `uiInterface`, etc) 2. Making it report errors using an `enum` rather than by setting a `bilingual_str` 3. Makes `*TestingSetup` use this new `::LoadChainstateSequence` Reviewers: Aside from commentary, I've also included `git diff` flags of interest in the commit messages which I hope will aid review! ACKs for top commit: ryanofsky: Code review ACK7f15eff2dd. Thanks for updates! MarcoFalke: review ACK7f15eff2dd💳 Tree-SHA512: fb9a6cbd1c511a52b477c62a5e68e53a8be5dec2fff0e44a279966afb91efbab44bf1fe7c6b1519f8464ecc25f42dd4bae8e1efbf55ee91fc90fa0b92e3a83e2
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
#include <net_processing.h>
|
||||
#include <node/miner.h>
|
||||
#include <noui.h>
|
||||
#include <node/blockstorage.h>
|
||||
#include <node/chainstate.h>
|
||||
#include <policy/fees.h>
|
||||
#include <pow.h>
|
||||
#include <rpc/blockchain.h>
|
||||
@@ -24,6 +26,7 @@
|
||||
#include <rpc/server.h>
|
||||
#include <scheduler.h>
|
||||
#include <script/sigcache.h>
|
||||
#include <shutdown.h>
|
||||
#include <streams.h>
|
||||
#include <txdb.h>
|
||||
#include <util/strencodings.h>
|
||||
@@ -143,8 +146,10 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::ve
|
||||
m_node.fee_estimator = std::make_unique<CBlockPolicyEstimator>();
|
||||
m_node.mempool = std::make_unique<CTxMemPool>(m_node.fee_estimator.get(), 1);
|
||||
|
||||
m_cache_sizes = CalculateCacheSizes(m_args);
|
||||
|
||||
m_node.chainman = std::make_unique<ChainstateManager>();
|
||||
m_node.chainman->m_blockman.m_block_tree_db = std::make_unique<CBlockTreeDB>(1 << 20, true);
|
||||
m_node.chainman->m_blockman.m_block_tree_db = std::make_unique<CBlockTreeDB>(m_cache_sizes.block_tree_db, true);
|
||||
|
||||
// Start script-checking threads. Set g_parallel_script_checks to true so they are used.
|
||||
constexpr int script_check_threads = 2;
|
||||
@@ -177,15 +182,18 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
|
||||
// instead of unit tests, but for now we need these here.
|
||||
RegisterAllCoreRPCCommands(tableRPC);
|
||||
|
||||
m_node.chainman->InitializeChainstate(m_node.mempool.get());
|
||||
m_node.chainman->ActiveChainstate().InitCoinsDB(
|
||||
/*cache_size_bytes=*/1 << 23, /*in_memory=*/true, /*should_wipe=*/false);
|
||||
assert(!m_node.chainman->ActiveChainstate().CanFlushToDisk());
|
||||
m_node.chainman->ActiveChainstate().InitCoinsCache(1 << 23);
|
||||
assert(m_node.chainman->ActiveChainstate().CanFlushToDisk());
|
||||
if (!m_node.chainman->ActiveChainstate().LoadGenesisBlock()) {
|
||||
throw std::runtime_error("LoadGenesisBlock failed.");
|
||||
}
|
||||
auto rv = LoadChainstate(fReindex.load(),
|
||||
*Assert(m_node.chainman.get()),
|
||||
Assert(m_node.mempool.get()),
|
||||
fPruneMode,
|
||||
chainparams.GetConsensus(),
|
||||
m_args.GetBoolArg("-reindex-chainstate", false),
|
||||
m_cache_sizes.block_tree_db,
|
||||
m_cache_sizes.coins_db,
|
||||
m_cache_sizes.coins,
|
||||
true,
|
||||
true);
|
||||
assert(!rv.has_value());
|
||||
|
||||
BlockValidationState state;
|
||||
if (!m_node.chainman->ActiveChainstate().ActivateBestChain(state)) {
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <fs.h>
|
||||
#include <key.h>
|
||||
#include <util/system.h>
|
||||
#include <node/caches.h>
|
||||
#include <node/context.h>
|
||||
#include <pubkey.h>
|
||||
#include <random.h>
|
||||
@@ -89,6 +90,7 @@ struct BasicTestingSetup {
|
||||
* initialization behaviour.
|
||||
*/
|
||||
struct ChainTestingSetup : public BasicTestingSetup {
|
||||
CacheSizes m_cache_sizes{};
|
||||
|
||||
explicit ChainTestingSetup(const std::string& chainName = CBaseChainParams::MAIN, const std::vector<const char*>& extra_args = {});
|
||||
~ChainTestingSetup();
|
||||
|
||||
Reference in New Issue
Block a user