Skip to content

Commit 85d96c2

Browse files
committed
merge bitcoin#25047: add readability-redundant-declaration
1 parent 71b400d commit 85d96c2

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

src/.clang-tidy

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
Checks: '-*,bugprone-argument-comment,modernize-use-nullptr'
2-
WarningsAsErrors: 'bugprone-argument-comment,modernize-use-nullptr'
1+
Checks: '
2+
-*,
3+
bugprone-argument-comment,
4+
modernize-use-nullptr,
5+
readability-redundant-declaration,
6+
'
7+
WarningsAsErrors: '
8+
bugprone-argument-comment,
9+
modernize-use-nullptr,
10+
readability-redundant-declaration,
11+
'

src/net.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@ static const uint64_t SELECT_TIMEOUT_MILLISECONDS = 500;
134134

135135
const std::string NET_MESSAGE_TYPE_OTHER = "*other*";
136136

137-
constexpr const CConnman::CFullyConnectedOnly CConnman::FullyConnectedOnly;
138-
constexpr const CConnman::CAllNodes CConnman::AllNodes;
139-
140137
static const uint64_t RANDOMIZER_ID_NETGROUP = 0x6c0edd8036ef4036ULL; // SHA256("netgroup")[0:8]
141138
static const uint64_t RANDOMIZER_ID_LOCALHOSTNONCE = 0xd93e69e2bbfa5735ULL; // SHA256("localhostnonce")[0:8]
142139
static const uint64_t RANDOMIZER_ID_ADDRCACHE = 0x1cf2e4ddd306dda9ULL; // SHA256("addrcache")[0:8]

src/netaddress.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
#include <ios>
2020
#include <tuple>
2121

22-
constexpr size_t CNetAddr::V1_SERIALIZATION_SIZE;
23-
constexpr size_t CNetAddr::MAX_ADDRV2_SIZE;
24-
2522
CNetAddr::BIP155Network CNetAddr::GetBIP155Network() const
2623
{
2724
switch (m_net) {

src/rpc/quorums.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
#include <iomanip>
3434
#include <optional>
3535

36-
namespace llmq {
37-
extern const std::string CLSIG_REQUESTID_PREFIX;
38-
}
39-
4036
static RPCHelpMan quorum_list()
4137
{
4238
return RPCHelpMan{"quorum list",

src/wallet/test/psbt_wallet_tests.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include <boost/test/unit_test.hpp>
1111
#include <wallet/test/wallet_test_fixture.h>
1212

13-
extern bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypath);
14-
1513
BOOST_FIXTURE_TEST_SUITE(psbt_wallet_tests, WalletTestingSetup)
1614

1715
BOOST_AUTO_TEST_CASE(psbt_updater_test)

0 commit comments

Comments
 (0)