Merge pull request #3591 from anoma/tomas/max-block-time-estimate

parameters/max_block_time: fallback to parameters only when no blocks
anoma · Aug 8, 2024 · 26e628a · 26e628a
2 parents 7b052e5 + 4f584de
commit 26e628a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/.changelog/unreleased/improvements/3591-max-block-time-estimate.md b/.changelog/unreleased/improvements/3591-max-block-time-estimate.md
@@ -0,0 +1,2 @@
+- Improved the `max_block_time` estimate.
+  ([\#3591](https://github.com/anoma/namada/pull/3591))
diff --git a/crates/parameters/src/lib.rs b/crates/parameters/src/lib.rs
@@ -622,18 +622,9 @@ where
         last_block_height,
         num_blocks_to_read,
     )?;
-    let max_block_time_estimate =
-        estimate_max_block_time_from_parameters(storage)?;
-
-    Ok(maybe_max_block_time.map_or(
-        max_block_time_estimate,
-        |max_block_time_over_num_blocks_to_read| {
-            std::cmp::max(
-                max_block_time_over_num_blocks_to_read,
-                max_block_time_estimate,
-            )
-        },
-    ))
+
+    maybe_max_block_time
+        .map_or_else(|| estimate_max_block_time_from_parameters(storage), Ok)
 }
 
 #[cfg(test)]