Rename PendingPaymentDetails to RecentPaymentDetails

Author: jurvis

lightning/src/ln/channelmanager.rs

@@ -1206,9 +1206,9 @@ impl ChannelDetails {
 
 /// Used to express the status of payments that are currently pending resolution.
 #[derive(Debug, PartialEq)]
-pub enum PendingPaymentDetails {
+pub enum RecentPaymentDetails {
 	/// When a payment is still being sent and awaiting successful delivery.
-	Retryable {
+	Pending {
 		/// Hash of the payment that is currently being sent but has yet to be fulfilled or
 		/// abandoned.
 		payment_hash: PaymentHash,
@@ -1801,20 +1801,20 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 	}
 
 	/// Gets a list of payments in ramdom order that are currently pending resolution.
-	pub fn list_pending_payments(&self) -> Vec<PendingPaymentDetails> {
+	pub fn list_pending_payments(&self) -> Vec<RecentPaymentDetails> {
 		self.pending_outbound_payments.lock().unwrap().iter()
 			.filter_map(|(_, pending_outbound_payment)| match pending_outbound_payment {
 				PendingOutboundPayment::Retryable { payment_hash, total_msat, .. } => {
-					Some(PendingPaymentDetails::Retryable {
+					Some(RecentPaymentDetails::Pending {
 						payment_hash: *payment_hash,
 						total_msat: *total_msat,
 					})
 				},
 				PendingOutboundPayment::Abandoned { payment_hash, .. } => {
-					Some(PendingPaymentDetails::Abandoned { payment_hash: *payment_hash })
+					Some(RecentPaymentDetails::Abandoned { payment_hash: *payment_hash })
 				},
 				PendingOutboundPayment::Fulfilled { payment_hash, .. } => {
-					Some(PendingPaymentDetails::Fulfilled { payment_hash: *payment_hash })
+					Some(RecentPaymentDetails::Fulfilled { payment_hash: *payment_hash })
 				},
 				PendingOutboundPayment::Legacy { .. } => None
 			})

lightning/src/ln/payment_tests.rs

@@ -16,7 +16,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, LATENCY_GRACE_PERIOD_BLOCKS
 use crate::chain::transaction::OutPoint;
 use crate::chain::keysinterface::KeysInterface;
 use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
-use crate::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChannelManager, MPP_TIMEOUT_TICKS, MIN_CLTV_EXPIRY_DELTA, PaymentId, PaymentSendFailure, IDEMPOTENCY_TIMEOUT_TICKS, PendingPaymentDetails};
+use crate::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChannelManager, MPP_TIMEOUT_TICKS, MIN_CLTV_EXPIRY_DELTA, PaymentId, PaymentSendFailure, IDEMPOTENCY_TIMEOUT_TICKS, RecentPaymentDetails};
 use crate::ln::msgs;
 use crate::ln::msgs::ChannelMessageHandler;
 use crate::routing::router::{PaymentParameters, get_route};
@@ -1282,7 +1282,7 @@ fn test_trivial_inflight_htlc_tracking(){
 
 		let pending_payments = nodes[0].node.list_pending_payments();
 		assert_eq!(pending_payments.len(), 1);
-		assert_eq!(pending_payments[0], PendingPaymentDetails::Fulfilled);
+		assert_eq!(pending_payments[0], RecentPaymentDetails::Fulfilled);
 	}
 
 	// Remove fulfilled payment
@@ -1317,7 +1317,7 @@ fn test_trivial_inflight_htlc_tracking(){
 
 		let pending_payments = nodes[0].node.list_pending_payments();
 		assert_eq!(pending_payments.len(), 1);
-		assert_eq!(pending_payments[0], PendingPaymentDetails::Retryable { total_msat: 500000 });
+		assert_eq!(pending_payments[0], RecentPaymentDetails::Retryable { total_msat: 500000 });
 	}
 
 	// Now, let's claim the payment. This should result in the used liquidity to return `None`.