From 55c79a9cefb6c83cdebbf6c538c471607695b457 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Thu, 25 Jun 2020 15:37:51 -0400 Subject: [PATCH] ProcessOrphanTx: remove useless done variable There is a keyword that allows us to break out of loops. Use it. There's a small change in behaviour here: if we process multiple orphans that are still orphans, then we'll only call mempool.check() once at the end, instead of after processing each tx. --- src/net_processing.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index c932062a28..45cb29065e 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2049,8 +2049,8 @@ void PeerManager::ProcessOrphanTx(std::set& orphan_work_set, std::list< AssertLockHeld(cs_main); AssertLockHeld(g_cs_orphans); std::set setMisbehaving; - bool done = false; - while (!done && !orphan_work_set.empty()) { + + while (!orphan_work_set.empty()) { const uint256 orphanHash = *orphan_work_set.begin(); orphan_work_set.erase(orphan_work_set.begin()); @@ -2078,7 +2078,7 @@ void PeerManager::ProcessOrphanTx(std::set& orphan_work_set, std::list< } } EraseOrphanTx(orphanHash); - done = true; + break; } else if (orphan_state.GetResult() != TxValidationResult::TX_MISSING_INPUTS) { if (orphan_state.IsInvalid()) { // Punish peer that gave us an invalid orphan tx @@ -2124,10 +2124,10 @@ void PeerManager::ProcessOrphanTx(std::set& orphan_work_set, std::list< } } EraseOrphanTx(orphanHash); - done = true; + break; } - m_mempool.check(&::ChainstateActive().CoinsTip()); } + m_mempool.check(&::ChainstateActive().CoinsTip()); } /**