Erase load_blocks Logic adjustment

qdrvm · Jan 10, 2025 · 49f3845 · 49f3845
1 parent 632eadb
commit 49f3845
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/core/network/impl/synchronizer_impl.cpp b/core/network/impl/synchronizer_impl.cpp
@@ -621,7 +621,18 @@ namespace kagome::network {
       if (not self) {
         return;
       }
-
+      {
+        std::unique_lock lock{self->load_blocks_mutex_};
+        if (auto it = self->load_blocks_.find(from);
+            it != self->load_blocks_.end()) {
+          auto &requests_number = it->second;
+          if (requests_number > 1) {
+            --requests_number;
+          } else {
+            self->load_blocks_.erase(it);
+          }
+        }
+      }
       // Any error interrupts loading of blocks
       if (response_res.has_error()) {
         SL_VERBOSE(self->log_,
@@ -685,23 +696,9 @@ namespace kagome::network {
           return;
         }
         auto &header = block.header.value();
-        if (first_block_of_pack) {
-          std::unique_lock lock{self->load_blocks_mutex_};
-          if (auto it =
-                  self->load_blocks_.find(BlockInfo(header.number, block.hash));
-              it != self->load_blocks_.end()) {
-            auto &requests_number = it->second;
-            if (requests_number > 1) {
-              --requests_number;
-            } else {
-              self->load_blocks_.erase(it);
-            }
-          }
-        }
 
         // Check if body is provided
-        if (need_body and block.header->number != 0
-            and not block.body.has_value()) {
+        if (need_body and header.number != 0 and not block.body.has_value()) {
           SL_VERBOSE(self->log_,
                      "Can't load blocks from {} starting from block {}: "
                      "Received block without body",