Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781)

This commit is contained in:
Byron Hambly 2025-04-10 08:56:13 +02:00
commit 59a4dcb178
17 changed files with 142 additions and 66 deletions

View file

@ -6028,7 +6028,9 @@ static ChainstateManager::Options&& Flatten(ChainstateManager::Options&& opts)
return std::move(opts);
}
ChainstateManager::ChainstateManager(Options options) : m_options{Flatten(std::move(options))} {}
ChainstateManager::ChainstateManager(Options options, node::BlockManager::Options blockman_options)
: m_options{Flatten(std::move(options))},
m_blockman{std::move(blockman_options)} {}
ChainstateManager::~ChainstateManager()
{