merge bitcoin#25047: add readability-redundant-declaration

dashpay · Feb 14, 2025 · 85d96c2 · 85d96c2
1 parent 71b400d
commit 85d96c2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/src/.clang-tidy b/src/.clang-tidy
@@ -1,2 +1,11 @@
-Checks:          '-*,bugprone-argument-comment,modernize-use-nullptr'
-WarningsAsErrors: 'bugprone-argument-comment,modernize-use-nullptr'
+Checks: '
+-*,
+bugprone-argument-comment,
+modernize-use-nullptr,
+readability-redundant-declaration,
+'
+WarningsAsErrors: '
+bugprone-argument-comment,
+modernize-use-nullptr,
+readability-redundant-declaration,
+'
diff --git a/src/net.cpp b/src/net.cpp
@@ -134,9 +134,6 @@ static const uint64_t SELECT_TIMEOUT_MILLISECONDS = 500;
 
 const std::string NET_MESSAGE_TYPE_OTHER = "*other*";
 
-constexpr const CConnman::CFullyConnectedOnly CConnman::FullyConnectedOnly;
-constexpr const CConnman::CAllNodes CConnman::AllNodes;
-
 static const uint64_t RANDOMIZER_ID_NETGROUP = 0x6c0edd8036ef4036ULL; // SHA256("netgroup")[0:8]
 static const uint64_t RANDOMIZER_ID_LOCALHOSTNONCE = 0xd93e69e2bbfa5735ULL; // SHA256("localhostnonce")[0:8]
 static const uint64_t RANDOMIZER_ID_ADDRCACHE = 0x1cf2e4ddd306dda9ULL; // SHA256("addrcache")[0:8]

diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -19,9 +19,6 @@
 #include <ios>
 #include <tuple>
 
-constexpr size_t CNetAddr::V1_SERIALIZATION_SIZE;
-constexpr size_t CNetAddr::MAX_ADDRV2_SIZE;
-
 CNetAddr::BIP155Network CNetAddr::GetBIP155Network() const
 {
     switch (m_net) {

diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
@@ -33,10 +33,6 @@
 #include <iomanip>
 #include <optional>
 
-namespace llmq {
-extern const std::string CLSIG_REQUESTID_PREFIX;
-}
-
 static RPCHelpMan quorum_list()
 {
     return RPCHelpMan{"quorum list",

diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp
@@ -10,8 +10,6 @@
 #include <boost/test/unit_test.hpp>
 #include <wallet/test/wallet_test_fixture.h>
 
-extern bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypath);
-
 BOOST_FIXTURE_TEST_SUITE(psbt_wallet_tests, WalletTestingSetup)
 
 BOOST_AUTO_TEST_CASE(psbt_updater_test)