init: Check mempool arguments in AppInitParameterInteractions

This makes the handling more consistent and reports errors sooner.
This commit is contained in:
TheCharlatan committed 2024-09-25 14:45:54 +02:00
1 parent 39219fe145
commit 781c01f580
1 file changed
+8 -4
+8 -4
View File
@@ -1072,6 +1072,13 @@ bool AppInitParameterInteraction(const ArgsManager& args)
if (!blockman_result) { if (!blockman_result) {
return InitError(util::ErrorString(blockman_result)); return InitError(util::ErrorString(blockman_result));
} }
CTxMemPool::Options mempool_opts{
.check_ratio = chainparams.DefaultConsistencyChecks() ? 1 : 0,
};
auto mempool_result{ApplyArgsManOptions(args, chainparams, mempool_opts)};
if (!mempool_result) {
return InitError(util::ErrorString(mempool_result));
}
} }
return true; return true;
@@ -1543,10 +1550,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
.check_ratio = chainparams.DefaultConsistencyChecks() ? 1 : 0, .check_ratio = chainparams.DefaultConsistencyChecks() ? 1 : 0,
.signals = &validation_signals, .signals = &validation_signals,
}; };
auto result{ApplyArgsManOptions(args, chainparams, mempool_opts)}; Assert(ApplyArgsManOptions(args, chainparams, mempool_opts)); // no error can happen, already checked in AppInitParameterInteraction
if (!result) {
return InitError(util::ErrorString(result));
}
bool do_reindex{args.GetBoolArg("-reindex", false)}; bool do_reindex{args.GetBoolArg("-reindex", false)};
const bool do_reindex_chainstate{args.GetBoolArg("-reindex-chainstate", false)}; const bool do_reindex_chainstate{args.GetBoolArg("-reindex-chainstate", false)};