GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ccd4db7d62 into merged_master (Bitcoin PR bitcoin/bitcoin#27570)

Browse source
This commit is contained in:
Byron Hambly 2025-05-16 09:52:58 +02:00
commit e22e1b9509
11 changed files with 58 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/init.cpp
View file

@ -1112,7 +1112,9 @@ bool AppInitParameterInteraction(const ArgsManager& args, bool use_syscall_sandb
if (const auto error{ApplyArgsManOptions(args, chainman_opts_dummy)}) {
return InitError(*error);
}
node::BlockManager::Options blockman_opts_dummy{};
node::BlockManager::Options blockman_opts_dummy{
.chainparams = chainman_opts_dummy.chainparams,
};
if (const auto error{ApplyArgsManOptions(args, blockman_opts_dummy)}) {
return InitError(*error);
}
@ -1581,7 +1583,9 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
};
Assert(!ApplyArgsManOptions(args, chainman_opts)); // no error can happen, already checked in AppInitParameterInteraction
node::BlockManager::Options blockman_opts{};
node::BlockManager::Options blockman_opts{
.chainparams = chainman_opts.chainparams,
};
Assert(!ApplyArgsManOptions(args, blockman_opts)); // no error can happen, already checked in AppInitParameterInteraction
// cache size calculations