Merge pull request #1960 from subspace/backport-fix-dsn-sync

Gemini 3f backport: Fix DSN sync
autonomys · Sep 13, 2023 · 303e99e · 303e99e
2 parents 5c24335 + ee999de
commit 303e99e
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/crates/subspace-service/src/sync_from_dsn/import_blocks.rs b/crates/subspace-service/src/sync_from_dsn/import_blocks.rs
@@ -222,17 +222,21 @@ where
             }
         }
 
-        // Import queue handles verification and importing it into the client
-        let last_segment = segment_indices_iter.peek().is_none();
-        if last_segment {
-            let last_block = blocks_to_import
-                .pop()
-                .expect("Not empty, checked above; qed");
-            import_queue_service.import_blocks(BlockOrigin::NetworkInitialSync, blocks_to_import);
-            // This will notify Substrate's sync mechanism and allow regular Substrate sync to continue gracefully
-            import_queue_service.import_blocks(BlockOrigin::NetworkBroadcast, vec![last_block]);
-        } else {
-            import_queue_service.import_blocks(BlockOrigin::NetworkInitialSync, blocks_to_import);
+        if !blocks_to_import.is_empty() {
+            // Import queue handles verification and importing it into the client
+            let last_segment = segment_indices_iter.peek().is_none();
+            if last_segment {
+                let last_block = blocks_to_import
+                    .pop()
+                    .expect("Not empty, checked above; qed");
+                import_queue_service
+                    .import_blocks(BlockOrigin::NetworkInitialSync, blocks_to_import);
+                // This will notify Substrate's sync mechanism and allow regular Substrate sync to continue gracefully
+                import_queue_service.import_blocks(BlockOrigin::NetworkBroadcast, vec![last_block]);
+            } else {
+                import_queue_service
+                    .import_blocks(BlockOrigin::NetworkInitialSync, blocks_to_import);
+            }
         }
 
         *last_processed_segment_index = segment_index;