chore: Tidy up backoff helper code

src/core/utils/mod.rs

@@ -38,8 +38,8 @@ pub use self::{
 	string::{str_from_bytes, string_from_bytes},
 	sys::compute::available_parallelism,
 	time::{
-		exponential_backoff::{continue_exponential_backoff, continue_exponential_backoff_secs},
-		now_millis as millis_since_unix_epoch, timepoint_ago, timepoint_from_now,
+		exponential_backoff::should_continue_backoff, now_millis as millis_since_unix_epoch,
+		timepoint_ago, timepoint_from_now,
 	},
 };
 

src/core/utils/time/exponential_backoff.rs

@@ -1,38 +1,23 @@
-use std::{cmp, time::Duration};
+use std::time::Duration;
 
-/// Returns false if the exponential backoff has expired based on the inputs
+/// Returns false if the backoff interval has expired based on the inputs,
+/// meaning the operation should be retried.
 #[inline]
 #[must_use]
-pub fn continue_exponential_backoff_secs(
-	min: u64,
-	max: u64,
-	elapsed: Duration,
-	tries: u32,
-) -> bool {
-	let min = Duration::from_secs(min);
-	let max = Duration::from_secs(max);
-	continue_exponential_backoff(min, max, elapsed, tries)
-}
-
-/// Returns false if the exponential backoff has expired based on the inputs
-#[inline]
-#[must_use]
-pub fn continue_exponential_backoff(
+pub fn should_continue_backoff(
 	min: Duration,
 	max: Duration,
 	elapsed: Duration,
 	tries: u32,
 ) -> bool {
-	let min = min.saturating_mul(tries).saturating_mul(tries);
-	let min = cmp::min(min, max);
-	elapsed < min
+	elapsed < next_interval(min, max, tries)
 }
 
-/// Determines the minimum number of backoff seconds
+/// Determines the interval that should be waited before retrying the operation
+/// using the algorithm: `(min * retries).min(max)`.
 #[must_use]
-pub fn min_exp_backoff_duration(min: u64, max: u64, retries: u32) -> Duration {
-	let min = Duration::from_secs(min)
-		.saturating_mul(retries)
-		.saturating_mul(retries);
-	Duration::from_secs(max).min(min)
+#[inline]
+pub fn next_interval(min: Duration, max: Duration, retries: u32) -> Duration {
+	// TODO(nex): jitter?
+	min.saturating_mul(retries).min(max)
 }