foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

Inline ReadPeerAddresses

Browse source 
No need to have a function that is only called in one place
This commit is contained in:
MarcoFalke 2021-08-21 15:20:00 +02:00
parent fa5aeec80c
commit fa4e2ccfd8
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/addrdb.cpp
View file

@ -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

1
src/addrdb.h
View file

@ -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);