rename last_height -> stop_height

astriaorg · Feb 4, 2025 · 31caab9 · 31caab9
1 parent 7b5b5fc
commit 31caab9
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/crates/astria-conductor/src/sequencer/block_stream.rs b/crates/astria-conductor/src/sequencer/block_stream.rs
@@ -36,7 +36,7 @@ struct Heights {
     rollup_expects: u64,
     greatest_requested_height: Option<u64>,
     latest_observed_sequencer_height: Option<u64>,
-    last_height: Option<NonZeroU64>,
+    stop_height: Option<NonZeroU64>,
     max_ahead: u64,
 }
 
@@ -51,11 +51,11 @@ impl Heights {
         let not_too_far_ahead =
             potential_height < (self.rollup_expects.saturating_add(self.max_ahead));
         let height_exists_on_sequencer = potential_height <= latest_observed_sequencer_height;
-        let last_height_reached = self
-            .last_height
-            .map_or(false, |last_height| potential_height > last_height.into());
+        let stop_height_reached = self
+            .stop_height
+            .map_or(false, |stop_height| potential_height > stop_height.into());
 
-        if not_too_far_ahead && height_exists_on_sequencer && !last_height_reached {
+        if not_too_far_ahead && height_exists_on_sequencer && !stop_height_reached {
             Some(potential_height)
         } else {
             None
@@ -161,7 +161,7 @@ impl BlocksFromHeightStream {
             rollup_expects: first_height.value(),
             latest_observed_sequencer_height: None,
             greatest_requested_height: None,
-            last_height,
+            stop_height: last_height,
             max_ahead: 128,
         };
         Self {
@@ -291,7 +291,7 @@ mod tests {
             rollup_expects: 5,
             greatest_requested_height: None,
             latest_observed_sequencer_height: Some(6),
-            last_height: None,
+            stop_height: None,
             max_ahead: 3,
         };
         let next = heights.next_height_to_fetch();
@@ -317,7 +317,7 @@ mod tests {
             rollup_expects: 4,
             greatest_requested_height: Some(5),
             latest_observed_sequencer_height: Some(6),
-            last_height: None,
+            stop_height: None,
             max_ahead: 2,
         };
         let next = heights.next_height_to_fetch();
@@ -330,7 +330,7 @@ mod tests {
             rollup_expects: 4,
             greatest_requested_height: Some(6),
             latest_observed_sequencer_height: Some(6),
-            last_height: Some(NonZeroU64::new(6).unwrap()),
+            stop_height: Some(NonZeroU64::new(6).unwrap()),
             max_ahead: 5,
         };
         let next = heights.next_height_to_fetch();
@@ -343,7 +343,7 @@ mod tests {
             rollup_expects: 4,
             greatest_requested_height: Some(5),
             latest_observed_sequencer_height: Some(5),
-            last_height: None,
+            stop_height: None,
             max_ahead: 2,
         };
         let next = heights.next_height_to_fetch();
@@ -356,7 +356,7 @@ mod tests {
             rollup_expects: 5,
             greatest_requested_height: None,
             latest_observed_sequencer_height: None,
-            last_height: None,
+            stop_height: None,
             max_ahead: 3,
         };
         let next = heights.next_height_to_fetch();