From 71689fe6dcfce9f7fe42e75767009f98fa5850e2 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 18 Nov 2021 07:37:28 +0800 Subject: [PATCH] (partial) Merge bitcoin/bitcoin#22981: doc: Fix incorrect C++ named args fac49470ca36ff944a613f4358386bf8e0967427 doc: Fix incorrect C++ named args (MarcoFalke) Pull request description: Incorrect named args are source of bugs, like #22979. Fix that by correcting them and adjust the format, so that clang-tidy can check it. ACKs for top commit: fanquake: ACK fac49470ca36ff944a613f4358386bf8e0967427 - `run-clang-tidy` works for me now. Tree-SHA512: 2694e17a1586394baf30bbc479a913e4bad361221e8470b8739caf30aacea736befc73820f3fe56f6207d9f5d969323278d43a647f58c3497e8e44cad79f8934 --- src/bench/rpc_mempool.cpp | 2 +- src/net.cpp | 2 +- src/net_processing.cpp | 2 +- src/qt/test/test_main.cpp | 2 +- src/rpc/mining.cpp | 2 +- src/rpc/rawtransaction.cpp | 4 ++-- src/test/denialofservice_tests.cpp | 4 ++-- src/test/fuzz/tx_pool.cpp | 2 +- src/test/validation_block_tests.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp index 013f56342e..a874fab0f7 100644 --- a/src/bench/rpc_mempool.cpp +++ b/src/bench/rpc_mempool.cpp @@ -12,7 +12,7 @@ static void AddTx(const CTransactionRef& tx, const CAmount& fee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs) { LockPoints lp; - pool.addUnchecked(CTxMemPoolEntry(tx, fee, /* time */ 0, /* height */ 1, /* spendsCoinbase */ false, /* sigOps */ 1, lp)); + pool.addUnchecked(CTxMemPoolEntry(tx, fee, /*time=*/0, /*entry_height=*/1, /*spends_coinbase=*/false, /*sigops*/1, lp)); } static void RpcMempool(benchmark::Bench& bench) diff --git a/src/net.cpp b/src/net.cpp index 4fcbbfb3c1..e8645f9b83 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -4279,7 +4279,7 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg) size_t nMessageSize = msg.data.size(); LogPrint(BCLog::NET, "sending %s (%d bytes) peer=%d\n", msg.m_type, nMessageSize, pnode->GetId()); if (gArgs.GetBoolArg("-capturemessages", false)) { - CaptureMessage(pnode->addr, msg.m_type, msg.data, /* incoming */ false); + CaptureMessage(pnode->addr, msg.m_type, msg.data, /*is_incoming=*/false); } TRACE6(net, outbound_message, diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 3d134aa7fa..1ae3eaba36 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -5060,7 +5060,7 @@ bool PeerManagerImpl::ProcessMessages(CNode* pfrom, std::atomic& interrupt ); if (gArgs.GetBoolArg("-capturemessages", false)) { - CaptureMessage(pfrom->addr, msg.m_type, MakeUCharSpan(msg.m_recv), /* incoming */ true); + CaptureMessage(pfrom->addr, msg.m_type, MakeUCharSpan(msg.m_recv), /* is_incoming */ true); } msg.SetVersion(pfrom->GetCommonVersion()); diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 78d8331eb3..34ea983441 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -74,7 +74,7 @@ int main(int argc, char* argv[]) #if defined(WIN32) if (getenv("QT_QPA_PLATFORM") == nullptr) _putenv_s("QT_QPA_PLATFORM", "minimal"); #else - setenv("QT_QPA_PLATFORM", "minimal", /* overwrite */ 0); + setenv("QT_QPA_PLATFORM", "minimal", 0 /* overwrite */); #endif BitcoinApplication app; diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 026ceb2fc2..9a41712b0a 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -1060,7 +1060,7 @@ static RPCHelpMan submitblock() bool new_block; auto sc = std::make_shared(block.GetHash()); RegisterSharedValidationInterface(sc); - bool accepted = chainman.ProcessNewBlock(Params(), blockptr, /* fForceProcessing */ true, /* fNewBlock */ &new_block); + bool accepted = chainman.ProcessNewBlock(Params(), blockptr, /*force_processing=*/true, /*new_block=*/&new_block); UnregisterSharedValidationInterface(sc); if (!new_block && accepted) { return "duplicate"; diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index d3c37f7345..208529414e 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1849,7 +1849,7 @@ static RPCHelpMan utxoupdatepsbt() } } // We don't actually need private keys further on; hide them as a precaution. - HidingSigningProvider public_provider(&provider, /* nosign */ true, /* nobip32derivs */ false); + HidingSigningProvider public_provider(&provider, /*hide_secret=*/true, /*hide_origin=*/false); // Fetch previous transactions (inputs): CCoinsView viewDummy; @@ -1881,7 +1881,7 @@ static RPCHelpMan utxoupdatepsbt() // Update script/keypath information using descriptor data. // Note that SignPSBTInput does a lot more than just constructing ECDSA signatures // we don't actually care about those here, in fact. - SignPSBTInput(public_provider, psbtx, i, /* sighash_type */ SIGHASH_ALL); + SignPSBTInput(public_provider, psbtx, i, /*sighash=*/ SIGHASH_ALL); } // Update script/keypath information using descriptor data. diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp index d34f15b78e..408a112ff6 100644 --- a/src/test/denialofservice_tests.cpp +++ b/src/test/denialofservice_tests.cpp @@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE(peer_discouragement) /*nKeyedNetGroupIn=*/1, /*nLocalHostNonceIn=*/1, CAddress(), - /*pszDest=*/"", + /*addrNameIn=*/"", ConnectionType::INBOUND, /*inbound_onion=*/false}; nodes[1]->SetCommonVersion(PROTOCOL_VERSION); @@ -361,7 +361,7 @@ BOOST_AUTO_TEST_CASE(peer_discouragement) /*nKeyedNetGroupIn=*/1, /*nLocalHostNonceIn=*/1, CAddress(), - /*pszDest=*/"", + /*addrNameIn=*/"", ConnectionType::OUTBOUND_FULL_RELAY, /*inbound_onion=*/false}; nodes[2]->SetCommonVersion(PROTOCOL_VERSION); diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp index cbdffe29d8..c689b52cc6 100644 --- a/src/test/fuzz/tx_pool.cpp +++ b/src/test/fuzz/tx_pool.cpp @@ -93,7 +93,7 @@ void Finish(FuzzedDataProvider& fuzzed_data_provider, MockedTxPool& tx_pool, con const auto info_all = tx_pool.infoAll(); if (!info_all.empty()) { const auto& tx_to_remove = *PickValue(fuzzed_data_provider, info_all).tx; - WITH_LOCK(tx_pool.cs, tx_pool.removeRecursive(tx_to_remove, /* dummy */ MemPoolRemovalReason::BLOCK)); + WITH_LOCK(tx_pool.cs, tx_pool.removeRecursive(tx_to_remove, MemPoolRemovalReason::BLOCK /* dummy */)); std::vector all_txids; tx_pool.queryHashes(all_txids); assert(all_txids.size() < info_all.size()); diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp index 352421a815..e532da6289 100644 --- a/src/test/validation_block_tests.cpp +++ b/src/test/validation_block_tests.cpp @@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE(mempool_locks_reorg) { bool ignored; auto ProcessBlock = [&](std::shared_ptr block) -> bool { - return Assert(m_node.chainman)->ProcessNewBlock(Params(), block, /* fForceProcessing */ true, /* fNewBlock */ &ignored); + return Assert(m_node.chainman)->ProcessNewBlock(Params(), block, /*force_processing=*/true, /*new_block=*/&ignored); }; // Process all mined blocks