From: Valentine Wallace <vwallace@protonmail.com>
Date: Sun, 18 Dec 2022 22:02:17 +0000 (-0500)
Subject: Copy Retry from invoice module to outbound_payment module
X-Git-Tag: v0.0.114-beta~43^2~10
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=cbb75e27b22c443e625a983134666c28675112e3;p=rust-lightning

Copy Retry from invoice module to outbound_payment module

Also configure it such that in std tests, it will use SinceEpoch instead of
Instant so time can be manually advanced.
---

diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index a4def55cf..a9c1e393d 100644
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -187,6 +187,36 @@ impl PendingOutboundPayment {
 	}
 }
 
+/// Strategies available to retry payment path failures.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum Retry {
+	/// Max number of attempts to retry payment.
+	///
+	/// Note that this is the number of *path* failures, not full payment retries. For multi-path
+	/// payments, if this is less than the total number of paths, we will never even retry all of the
+	/// payment's paths.
+	Attempts(usize),
+	#[cfg(not(feature = "no-std"))]
+	/// Time elapsed before abandoning retries for a payment.
+	Timeout(core::time::Duration),
+}
+
+impl Retry {
+	pub(crate) fn is_retryable_now(&self, attempts: &PaymentAttempts) -> bool {
+		match (self, attempts) {
+			(Retry::Attempts(max_retry_count), PaymentAttempts { count, .. }) => {
+				max_retry_count > count
+			},
+			#[cfg(all(not(feature = "no-std"), not(test)))]
+			(Retry::Timeout(max_duration), PaymentAttempts { first_attempted_at, .. }) =>
+				*max_duration >= std::time::Instant::now().duration_since(*first_attempted_at),
+			#[cfg(all(not(feature = "no-std"), test))]
+			(Retry::Timeout(max_duration), PaymentAttempts { first_attempted_at, .. }) =>
+				*max_duration >= SinceEpoch::now().duration_since(*first_attempted_at),
+		}
+	}
+}
+
 pub(crate) type PaymentAttempts = PaymentAttemptsUsingTime<ConfiguredTime>;
 
 /// Storing minimal payment attempts information required for determining if a outbound payment can