From 44d89fbff29694976be2f8c7809fe246ec2ac5ae Mon Sep 17 00:00:00 2001 From: Boris Erakhtin Date: Fri, 21 Feb 2025 13:06:44 +0500 Subject: [PATCH] pr_update: fix of cleanup guard by comment and clang tidy --- .../validator/impl/parachain_processor.cpp | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/core/parachain/validator/impl/parachain_processor.cpp b/core/parachain/validator/impl/parachain_processor.cpp index c67e5feb20..927450aab6 100644 --- a/core/parachain/validator/impl/parachain_processor.cpp +++ b/core/parachain/validator/impl/parachain_processor.cpp @@ -3387,14 +3387,10 @@ namespace kagome::parachain { return; } - struct CleanupGuard { - std::function cleanup; - ~CleanupGuard() { - cleanup(); - } - } cleanup_guard{[this, &block_hash] { - state_by_relay_parent_to_check_.erase(block_hash); - }}; + auto cleanup_guard = std::unique_ptr>( + new int, [this, &block_hash](void *) { + state_by_relay_parent_to_check_.erase(block_hash); + }); const auto ¶chain_state = it->second; @@ -3481,21 +3477,21 @@ namespace kagome::parachain { if (explicit_found) { SL_TRACE(logger_, - "Explicit vote found for parachain {} on relay parent {}", - parachain_id, - block_hash); + "Explicit vote found for parachain {} on relay parent {}", + parachain_id, + block_hash); metric_kagome_parachain_candidate_explicit_votes_total_->inc(); } else if (implicit_found) { SL_TRACE(logger_, - "Implicit vote found for parachain {} on relay parent {}", - parachain_id, - block_hash); + "Implicit vote found for parachain {} on relay parent {}", + parachain_id, + block_hash); metric_kagome_parachain_candidate_implicit_votes_total_->inc(); } else { SL_TRACE(logger_, - "No vote found for parachain {} on relay parent {}", - parachain_id, - block_hash); + "No vote found for parachain {} on relay parent {}", + parachain_id, + block_hash); metric_kagome_parachain_candidate_no_votes_total_->inc(); } }