refactor: Drop no longer needed util/designator.h

hebasto · hebasto · commit 630c1711b47c · 2022-07-07T20:01:01.000+01:00
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -261,7 +261,6 @@ BITCOIN_CORE_H = \
   util/bip32.h \
   util/bytevectorhash.h \
   util/check.h \
-  util/designator.h \
   util/epochguard.h \
   util/error.h \
   util/fastrange.h \
diff --git a/src/init.cpp b/src/init.cpp
@@ -64,7 +64,6 @@
 #include <txorphanage.h>
 #include <util/asmap.h>
 #include <util/check.h>
-#include <util/designator.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/string.h>
@@ -1424,8 +1423,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     assert(!node.chainman);
 
     CTxMemPool::Options mempool_opts{
-        Desig(estimator) node.fee_estimator.get(),
-        Desig(check_ratio) chainparams.DefaultConsistencyChecks() ? 1 : 0,
+        .estimator = node.fee_estimator.get(),
+        .check_ratio = chainparams.DefaultConsistencyChecks() ? 1 : 0,
     };
     ApplyArgsManOptions(args, mempool_opts);
     mempool_opts.check_ratio = std::clamp<int>(mempool_opts.check_ratio, 0, 1'000'000);
diff --git a/src/net.cpp b/src/net.cpp
@@ -26,7 +26,6 @@
 #include <protocol.h>
 #include <random.h>
 #include <scheduler.h>
-#include <util/designator.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
 #include <util/syscall_sandbox.h>
@@ -876,20 +875,20 @@ bool CConnman::AttemptToEvictConnection()
             if (node->fDisconnect)
                 continue;
             NodeEvictionCandidate candidate{
-                Desig(id) node->GetId(),
-                Desig(m_connected) node->m_connected,
-                Desig(m_min_ping_time) node->m_min_ping_time,
-                Desig(m_last_block_time) node->m_last_block_time,
-                Desig(m_last_tx_time) node->m_last_tx_time,
-                Desig(fRelevantServices) HasAllDesirableServiceFlags(node->nServices),
-                Desig(m_relay_txs) node->m_relays_txs.load(),
-                Desig(fBloomFilter) node->m_bloom_filter_loaded.load(),
-                Desig(nKeyedNetGroup) node->nKeyedNetGroup,
-                Desig(prefer_evict) node->m_prefer_evict,
-                Desig(m_is_local) node->addr.IsLocal(),
-                Desig(m_network) node->ConnectedThroughNetwork(),
-                Desig(m_noban) node->HasPermission(NetPermissionFlags::NoBan),
-                Desig(m_conn_type) node->m_conn_type,
+                .id = node->GetId(),
+                .m_connected = node->m_connected,
+                .m_min_ping_time = node->m_min_ping_time,
+                .m_last_block_time = node->m_last_block_time,
+                .m_last_tx_time = node->m_last_tx_time,
+                .fRelevantServices = HasAllDesirableServiceFlags(node->nServices),
+                .m_relay_txs = node->m_relays_txs.load(),
+                .fBloomFilter = node->m_bloom_filter_loaded.load(),
+                .nKeyedNetGroup = node->nKeyedNetGroup,
+                .prefer_evict = node->m_prefer_evict,
+                .m_is_local = node->addr.IsLocal(),
+                .m_network = node->ConnectedThroughNetwork(),
+                .m_noban = node->HasPermission(NetPermissionFlags::NoBan),
+                .m_conn_type = node->m_conn_type,
             };
             vEvictionCandidates.push_back(candidate);
         }
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -36,7 +36,6 @@
 #include <timedata.h>
 #include <txdb.h>
 #include <txmempool.h>
-#include <util/designator.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/thread.h>
@@ -158,10 +157,10 @@ BasicTestingSetup::~BasicTestingSetup()
 CTxMemPool::Options MemPoolOptionsForTest(const NodeContext& node)
 {
     CTxMemPool::Options mempool_opts{
-        Desig(estimator) node.fee_estimator.get(),
+        .estimator = node.fee_estimator.get(),
         // Default to always checking mempool regardless of
         // chainparams.DefaultConsistencyChecks for tests
-        Desig(check_ratio) 1,
+        .check_ratio = 1,
     };
     ApplyArgsManOptions(*node.args, mempool_opts);
     return mempool_opts;
diff --git a/src/util/designator.h b/src/util/designator.h
