Inline ReadPeerAddresses

MarcoFalke · MarcoFalke · commit fa4e2ccfd8ae · 2021-09-09T09:12:12.000+02:00
No need to have a function that is only called in one place
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
@@ -177,12 +177,6 @@ bool DumpPeerAddresses(const ArgsManager& args, const CAddrMan& addr)
     return SerializeFileDB("peers", pathAddr, addr, CLIENT_VERSION);
 }
 
-bool ReadPeerAddresses(const ArgsManager& args, CAddrMan& addr)
-{
-    const auto pathAddr = args.GetDataDirNet() / "peers.dat";
-    return DeserializeFileDB(pathAddr, addr, CLIENT_VERSION);
-}
-
 bool ReadFromStream(CAddrMan& addr, CDataStream& ssPeers)
 {
     return DeserializeDB(ssPeers, addr, false);
@@ -194,7 +188,8 @@ std::optional<bilingual_str> LoadAddrman(const std::vector<bool>& asmap, const A
     addrman = std::make_unique<CAddrMan>(asmap, /* deterministic */ false, /* consistency_check_ratio */ check_addrman);
 
     int64_t nStart = GetTimeMillis();
-    if (ReadPeerAddresses(args, *addrman)) {
+    const auto path_addr{args.GetDataDirNet() / "peers.dat"};
+    if (DeserializeFileDB(path_addr, *addrman, CLIENT_VERSION)) {
         LogPrintf("Loaded %i addresses from peers.dat  %dms\n", addrman->size(), GetTimeMillis() - nStart);
     } else {
         // Addrman can be in an inconsistent state after failure, reset it
diff --git a/src/addrdb.h b/src/addrdb.h
@@ -20,7 +20,6 @@ class CDataStream;
 struct bilingual_str;
 
 bool DumpPeerAddresses(const ArgsManager& args, const CAddrMan& addr);
-bool ReadPeerAddresses(const ArgsManager& args, CAddrMan& addr);
 /** Only used by tests. */
 bool ReadFromStream(CAddrMan& addr, CDataStream& ssPeers);
 
