Merge adea5e1b54 into merged_master (Bitcoin PR #18023)

This commit is contained in:
Andrew Poelstra 2020-11-26 00:29:44 +00:00
commit 8388f8d515
6 changed files with 89 additions and 63 deletions

View file

@ -1891,8 +1891,8 @@ bool AppInitMain(NodeContext& node)
InitError(strprintf(_("Could not find or parse specified asmap: '%s'").translated, asmap_path));
return false;
}
node.connman->SetAsmap(asmap);
const uint256 asmap_version = SerializeHash(asmap);
node.connman->SetAsmap(std::move(asmap));
LogPrintf("Using asmap version %s for IP bucketing.\n", asmap_version.ToString());
} else {
LogPrintf("Using /16 prefix for IP bucketing.\n");