Remove confusing CAddrDB

Summary:
Backport of [[bitcoin/bitcoin#22915 | core#22915]].

Depends on D12302.

Test Plan:
  ninja all check-all

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Subscribers: PiRK

Differential Revision: https://reviews.bitcoinabc.org/D12304

Author: MarcoFalke

src/addrdb.cpp

@@ -136,20 +136,20 @@ bool CBanDB::Read(banmap_t &banSet) {
     return DeserializeFileDB(chainParams, m_ban_list_path, banSet);
 }
 
-CAddrDB::CAddrDB(const CChainParams &chainParamsIn)
-    : chainParams(chainParamsIn) {
-    pathAddr = gArgs.GetDataDirNet() / "peers.dat";
-}
-
-bool CAddrDB::Write(const CAddrMan &addr) {
+bool DumpPeerAddresses(const CChainParams &chainParams, const ArgsManager &args,
+                       const CAddrMan &addr) {
+    const auto pathAddr = args.GetDataDirNet() / "peers.dat";
     return SerializeFileDB(chainParams, "peers", pathAddr, addr);
 }
 
-bool CAddrDB::Read(CAddrMan &addr) {
+bool ReadPeerAddresses(const CChainParams &chainParams, const ArgsManager &args,
+                       CAddrMan &addr) {
+    const auto pathAddr = args.GetDataDirNet() / "peers.dat";
     return DeserializeFileDB(chainParams, pathAddr, addr);
 }
 
-bool CAddrDB::Read(CAddrMan &addr, CDataStream &ssPeers) {
+bool ReadFromStream(const CChainParams &chainParams, CAddrMan &addr,
+                    CDataStream &ssPeers) {
     bool ret = DeserializeDB(chainParams, ssPeers, addr, false);
     if (!ret) {
         // Ensure addrman is left in a clean state

src/addrdb.h

@@ -13,11 +13,20 @@
 #include <string>
 #include <vector>
 
-class CAddress;
+class ArgsManager;
 class CAddrMan;
+class CAddress;
 class CDataStream;
 class CChainParams;
 
+bool DumpPeerAddresses(const CChainParams &chainParams, const ArgsManager &args,
+                       const CAddrMan &addr);
+bool ReadPeerAddresses(const CChainParams &chainParams, const ArgsManager &args,
+                       CAddrMan &addr);
+/** Only used by tests. */
+bool ReadFromStream(const CChainParams &chainParams, CAddrMan &addr,
+                    CDataStream &ssPeers);
+
 class CBanEntry {
 public:
     static const int CURRENT_VERSION = 1;
@@ -45,19 +54,6 @@ class CBanEntry {
     }
 };
 
-/** Access to the (IP) address database (peers.dat) */
-class CAddrDB {
-private:
-    fs::path pathAddr;
-    const CChainParams &chainParams;
-
-public:
-    explicit CAddrDB(const CChainParams &chainParams);
-    bool Write(const CAddrMan &addr);
-    bool Read(CAddrMan &addr);
-    bool Read(CAddrMan &addr, CDataStream &ssPeers);
-};
-
 /** Access to the banlist database (banlist.dat) */
 class CBanDB {
 private:

src/addrman.cpp

@@ -5,10 +5,12 @@
 
 #include <addrman.h>
 
+#include <clientversion.h>
 #include <hash.h>
 #include <logging.h>
 #include <netaddress.h>
 #include <serialize.h>
+#include <streams.h>
 #include <util/check.h>
 
 #include <cmath>

src/addrman.h

@@ -6,22 +6,14 @@
 #ifndef BITCOIN_ADDRMAN_H
 #define BITCOIN_ADDRMAN_H
 
-#include <clientversion.h>
-#include <config/bitcoin-config.h>
 #include <fs.h>
-#include <hash.h>
+#include <logging.h>
 #include <netaddress.h>
 #include <protocol.h>
-#include <random.h>
-#include <streams.h>
 #include <sync.h>
 #include <timedata.h>
-#include <util/system.h>
-
-#include <tinyformat.h>
 
 #include <cstdint>
-#include <iostream>
 #include <optional>
 #include <set>
 #include <unordered_map>

src/init.cpp

@@ -2406,16 +2406,15 @@ bool AppInitMain(Config &config, RPCServer &rpcServer,
         // Load addresses from peers.dat
         uiInterface.InitMessage(_("Loading P2P addresses...").translated);
         int64_t nStart = GetTimeMillis();
-        CAddrDB adb(chainparams);
-        if (adb.Read(*node.addrman)) {
+        if (ReadPeerAddresses(chainparams, args, *node.addrman)) {
             LogPrintf("Loaded %i addresses from peers.dat  %dms\n",
                       node.addrman->size(), GetTimeMillis() - nStart);
         } else {
             // Addrman can be in an inconsistent state after failure, reset it
             node.addrman = std::make_unique<CAddrMan>(
                 asmap, /* consistency_check_ratio= */ check_addrman);
             LogPrintf("Recreating peers.dat\n");
-            adb.Write(*node.addrman);
+            DumpPeerAddresses(chainparams, args, *node.addrman);
         }
     }
 

src/net.cpp

@@ -9,6 +9,7 @@
 
 #include <net.h>
 
+#include <addrdb.h>
 #include <avalanche/avalanche.h>
 #include <banman.h>
 #include <clientversion.h>
@@ -26,6 +27,7 @@
 #include <scheduler.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
+#include <util/system.h>
 #include <util/thread.h>
 #include <util/translation.h>
 
@@ -2055,8 +2057,7 @@ void CConnman::ThreadDNSAddressSeed() {
 void CConnman::DumpAddresses() {
     int64_t nStart = GetTimeMillis();
 
-    CAddrDB adb(config->GetChainParams());
-    adb.Write(addrman);
+    DumpPeerAddresses(config->GetChainParams(), ::gArgs, addrman);
 
     LogPrint(BCLog::NET, "Flushed %d addresses to peers.dat  %dms\n",
              addrman.size(), GetTimeMillis() - nStart);

src/net.h

@@ -7,7 +7,6 @@
 #ifndef BITCOIN_NET_H
 #define BITCOIN_NET_H
 
-#include <addrdb.h>
 #include <addrman.h>
 #include <avalanche/proofid.h>
 #include <avalanche/proofradixtreeadapter.h>

src/qt/bantablemodel.h

@@ -5,6 +5,7 @@
 #ifndef BITCOIN_QT_BANTABLEMODEL_H
 #define BITCOIN_QT_BANTABLEMODEL_H
 
+#include <addrdb.h>
 #include <net.h>
 
 #include <QAbstractTableModel>

src/qt/walletframe.cpp

@@ -10,6 +10,7 @@
 #include <qt/walletcontroller.h>
 #include <qt/walletmodel.h>
 #include <qt/walletview.h>
+#include <util/system.h>
 
 #include <QGroupBox>
 #include <QHBoxLayout>

src/test/addrman_tests.cpp

@@ -5,9 +5,11 @@
 #include <addrdb.h>
 #include <addrman.h>
 #include <chainparams.h>
+#include <clientversion.h>
 #include <hash.h>
 #include <netbase.h>
 #include <random.h>
+#include <streams.h>
 #include <util/asmap.h>
 #include <util/string.h>
 
@@ -984,7 +986,7 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks) {
     BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "[::]:0");
 }
 
-BOOST_AUTO_TEST_CASE(caddrdb_read) {
+BOOST_AUTO_TEST_CASE(load_addrman) {
     CAddrManUncorrupted addrmanUncorrupted;
     addrmanUncorrupted.MakeDeterministic();
 
@@ -1020,19 +1022,18 @@ BOOST_AUTO_TEST_CASE(caddrdb_read) {
     BOOST_CHECK(addrman1.size() == 3);
     BOOST_CHECK(exceptionThrown == false);
 
-    // Test that CAddrDB::Read creates an addrman with the correct number of
+    // Test that ReadFromStream creates an addrman with the correct number of
     // addrs.
     CDataStream ssPeers2 = AddrmanToStream(addrmanUncorrupted);
 
     CAddrMan addrman2(/* asmap= */ std::vector<bool>(),
                       /* consistency_check_ratio= */ 100);
-    CAddrDB adb(Params());
     BOOST_CHECK(addrman2.size() == 0);
-    BOOST_CHECK(adb.Read(addrman2, ssPeers2));
+    BOOST_CHECK(ReadFromStream(Params(), addrman2, ssPeers2));
     BOOST_CHECK(addrman2.size() == 3);
 }
 
-BOOST_AUTO_TEST_CASE(caddrdb_read_corrupted) {
+BOOST_AUTO_TEST_CASE(load_addrman_corrupted) {
     CAddrManCorrupted addrmanCorrupted;
     addrmanCorrupted.MakeDeterministic();
 
@@ -1049,20 +1050,18 @@ BOOST_AUTO_TEST_CASE(caddrdb_read_corrupted) {
     } catch (const std::exception &) {
         exceptionThrown = true;
     }
-    // Even through de-serialization failed addrman is not left in a clean
-    // state.
+    // Even though de-serialization failed addrman is not left in a clean state.
     BOOST_CHECK(addrman1.size() == 1);
     BOOST_CHECK(exceptionThrown);
 
-    // Test that CAddrDB::Read leaves addrman in a clean state if
+    // Test that ReadFromStream leaves addrman in a clean state if
     // de-serialization fails.
     CDataStream ssPeers2 = AddrmanToStream(addrmanCorrupted);
 
     CAddrMan addrman2(/* asmap= */ std::vector<bool>(),
                       /* consistency_check_ratio= */ 100);
-    CAddrDB adb(Params());
     BOOST_CHECK(addrman2.size() == 0);
-    BOOST_CHECK(!adb.Read(addrman2, ssPeers2));
+    BOOST_CHECK(!ReadFromStream(Params(), addrman2, ssPeers2));
     BOOST_CHECK(addrman2.size() == 0);
 }