Merge 515200298b into merged_master (Bitcoin PR bitcoin/bitcoin#24250)

This commit is contained in:
Byron Hambly 2023-06-30 08:06:50 +00:00
commit 08e52d10c8
5 changed files with 3033 additions and 2557 deletions

View file

@ -1260,7 +1260,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
auto opt_max_upload = ParseByteUnits(args.GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET), ByteUnit::M);
if (!opt_max_upload) {
return InitError(strprintf(_("Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)"), args.GetArg("-maxuploadtarget", "")));
return InitError(strprintf(_("Unable to parse -maxuploadtarget: '%s'"), args.GetArg("-maxuploadtarget", "")));
}
// ********************************************************* Step 4a: application initialization