f Don't change state upon duplicate payments

Author: tnull

src/lib.rs

@@ -1334,22 +1334,23 @@ impl Node {
 			}
 			Err(payment::PaymentError::Sending(e)) => {
 				log_error!(self.logger, "Failed to send payment: {:?}", e);
-
-				let payment = PaymentDetails {
-					preimage: None,
-					hash: payment_hash,
-					secret: payment_secret,
-					amount_msat: invoice.amount_milli_satoshis(),
-					direction: PaymentDirection::Outbound,
-					status: PaymentStatus::SendingFailed,
-				};
-				self.payment_store.insert(payment)?;
-
 				match e {
 					channelmanager::RetryableSendFailure::DuplicatePayment => {
 						Err(Error::DuplicatePayment)
 					}
-					_ => Err(Error::PaymentSendingFailed),
+					_ => {
+						let payment = PaymentDetails {
+							preimage: None,
+							hash: payment_hash,
+							secret: payment_secret,
+							amount_msat: invoice.amount_milli_satoshis(),
+							direction: PaymentDirection::Outbound,
+							status: PaymentStatus::SendingFailed,
+						};
+
+						self.payment_store.insert(payment)?;
+						Err(Error::PaymentSendingFailed)
+					}
 				}
 			}
 		}
@@ -1436,21 +1437,23 @@ impl Node {
 			Err(payment::PaymentError::Sending(e)) => {
 				log_error!(self.logger, "Failed to send payment: {:?}", e);
 
-				let payment = PaymentDetails {
-					hash: payment_hash,
-					preimage: None,
-					secret: payment_secret,
-					amount_msat: Some(amount_msat),
-					direction: PaymentDirection::Outbound,
-					status: PaymentStatus::SendingFailed,
-				};
-				self.payment_store.insert(payment)?;
-
 				match e {
 					channelmanager::RetryableSendFailure::DuplicatePayment => {
 						Err(Error::DuplicatePayment)
 					}
-					_ => Err(Error::PaymentSendingFailed),
+					_ => {
+						let payment = PaymentDetails {
+							hash: payment_hash,
+							preimage: None,
+							secret: payment_secret,
+							amount_msat: Some(amount_msat),
+							direction: PaymentDirection::Outbound,
+							status: PaymentStatus::SendingFailed,
+						};
+						self.payment_store.insert(payment)?;
+
+						Err(Error::PaymentSendingFailed)
+					}
 				}
 			}
 		}
@@ -1509,21 +1512,23 @@ impl Node {
 			Err(e) => {
 				log_error!(self.logger, "Failed to send payment: {:?}", e);
 
-				let payment = PaymentDetails {
-					hash: payment_hash,
-					preimage: Some(payment_preimage),
-					secret: None,
-					status: PaymentStatus::SendingFailed,
-					direction: PaymentDirection::Outbound,
-					amount_msat: Some(amount_msat),
-				};
-				self.payment_store.insert(payment)?;
-
 				match e {
 					channelmanager::RetryableSendFailure::DuplicatePayment => {
 						Err(Error::DuplicatePayment)
 					}
-					_ => Err(Error::PaymentSendingFailed),
+					_ => {
+						let payment = PaymentDetails {
+							hash: payment_hash,
+							preimage: Some(payment_preimage),
+							secret: None,
+							status: PaymentStatus::SendingFailed,
+							direction: PaymentDirection::Outbound,
+							amount_msat: Some(amount_msat),
+						};
+
+						self.payment_store.insert(payment)?;
+						Err(Error::PaymentSendingFailed)
+					}
 				}
 			}
 		}