Ignore older slots/segment headers too, not just equal

autonomys · Jun 28, 2024 · 1967e4c · 1967e4c
1 parent f6ed626
commit 1967e4c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/crates/subspace-farmer/src/cluster/controller.rs b/crates/subspace-farmer/src/cluster/controller.rs
@@ -306,7 +306,9 @@ impl NodeClient for ClusterNodeClient {
                 move |broadcast| {
                     let slot_info = broadcast.slot_info;
 
-                    let maybe_slot_info = if last_slot_number == Some(slot_info.slot_number) {
+                    let maybe_slot_info = if let Some(last_slot_number) = last_slot_number
+                        && last_slot_number >= slot_info.slot_number
+                    {
                         None
                     } else {
                         last_slot_number.replace(slot_info.slot_number);
@@ -377,14 +379,16 @@ impl NodeClient for ClusterNodeClient {
                     let archived_segment_header = broadcast.archived_segment_header;
                     let segment_index = archived_segment_header.segment_index();
 
-                    let maybe_archived_segment_header =
-                        if last_archived_segment_index == Some(segment_index) {
-                            None
-                        } else {
-                            last_archived_segment_index.replace(segment_index);
+                    let maybe_archived_segment_header = if let Some(last_archived_segment_index) =
+                        last_archived_segment_index
+                        && last_archived_segment_index >= segment_index
+                    {
+                        None
+                    } else {
+                        last_archived_segment_index.replace(segment_index);
 
-                            Some(archived_segment_header)
-                        };
+                        Some(archived_segment_header)
+                    };
 
                     async move { maybe_archived_segment_header }
                 }

diff --git a/crates/subspace-farmer/src/node_client/caching_proxy_node_client.rs b/crates/subspace-farmer/src/node_client/caching_proxy_node_client.rs
@@ -142,7 +142,9 @@ where
             async move {
                 let mut last_slot_number = None;
                 while let Some(slot_info) = slot_info_subscription.next().await {
-                    if last_slot_number == Some(slot_info.slot_number) {
+                    if let Some(last_slot_number) = last_slot_number
+                        && last_slot_number >= slot_info.slot_number
+                    {
                         continue;
                     }
                     last_slot_number.replace(slot_info.slot_number);
@@ -182,7 +184,9 @@ where
                         );
                     }
 
-                    if last_archived_segment_index == Some(segment_index) {
+                    if let Some(last_archived_segment_index) = last_archived_segment_index
+                        && last_archived_segment_index >= segment_index
+                    {
                         continue;
                     }
                     last_archived_segment_index.replace(segment_index);