Merge 5446070418 into merged_master (Bitcoin PR bitcoin/bitcoin#22911)

This commit is contained in:
James Dorfman 2023-04-21 06:10:28 +00:00
commit 5a22e7ab80
12 changed files with 52 additions and 53 deletions

View file

@ -1324,7 +1324,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
InitError(strprintf(_("Could not find asmap file %s"), asmap_path));
return false;
}
asmap = CAddrMan::DecodeAsmap(asmap_path);
asmap = DecodeAsmap(asmap_path);
if (asmap.size() == 0) {
InitError(strprintf(_("Could not parse asmap file %s"), asmap_path));
return false;