f Inline kind

Author: tnull

src/event.rs

@@ -600,13 +600,12 @@ where
 						return;
 					},
 					PaymentPurpose::SpontaneousPayment(preimage) => {
-						let kind = PaymentKind::Spontaneous {
-							hash: payment_hash,
-							preimage: Some(preimage),
-						};
 						let payment = PaymentDetails {
 							id: payment_id,
-							kind,
+							kind: PaymentKind::Spontaneous {
+								hash: payment_hash,
+								preimage: Some(preimage),
+							},
 							amount_msat: Some(amount_msat),
 							direction: PaymentDirection::Inbound,
 							status: PaymentStatus::Succeeded,

src/payment/bolt11.rs

@@ -102,19 +102,18 @@ impl Bolt11Payment {
 				let amt_msat = invoice.amount_milli_satoshis().unwrap();
 				log_info!(self.logger, "Initiated sending {}msat to {}", amt_msat, payee_pubkey);
 
-				let kind = PaymentKind::Bolt11 {
-					hash: payment_hash,
-					preimage: None,
-					secret: payment_secret,
-				};
-
 				let payment = PaymentDetails {
 					id: payment_id,
-					kind,
+					kind: PaymentKind::Bolt11 {
+						hash: payment_hash,
+						preimage: None,
+						secret: payment_secret,
+					},
 					amount_msat: invoice.amount_milli_satoshis(),
 					direction: PaymentDirection::Outbound,
 					status: PaymentStatus::Pending,
 				};
+
 				self.payment_store.insert(payment)?;
 
 				Ok(payment_id)
@@ -124,14 +123,13 @@ impl Bolt11Payment {
 				match e {
 					RetryableSendFailure::DuplicatePayment => Err(Error::DuplicatePayment),
 					_ => {
-						let kind = PaymentKind::Bolt11 {
-							hash: payment_hash,
-							preimage: None,
-							secret: payment_secret,
-						};
 						let payment = PaymentDetails {
 							id: payment_id,
-							kind,
+							kind: PaymentKind::Bolt11 {
+								hash: payment_hash,
+								preimage: None,
+								secret: payment_secret,
+							},
 							amount_msat: invoice.amount_milli_satoshis(),
 							direction: PaymentDirection::Outbound,
 							status: PaymentStatus::Failed,
@@ -215,15 +213,13 @@ impl Bolt11Payment {
 					payee_pubkey
 				);
 
-				let kind = PaymentKind::Bolt11 {
-					hash: payment_hash,
-					preimage: None,
-					secret: Some(*payment_secret),
-				};
-
 				let payment = PaymentDetails {
 					id: payment_id,
-					kind,
+					kind: PaymentKind::Bolt11 {
+						hash: payment_hash,
+						preimage: None,
+						secret: Some(*payment_secret),
+					},
 					amount_msat: Some(amount_msat),
 					direction: PaymentDirection::Outbound,
 					status: PaymentStatus::Pending,
@@ -238,15 +234,13 @@ impl Bolt11Payment {
 				match e {
 					RetryableSendFailure::DuplicatePayment => Err(Error::DuplicatePayment),
 					_ => {
-						let kind = PaymentKind::Bolt11 {
-							hash: payment_hash,
-							preimage: None,
-							secret: Some(*payment_secret),
-						};
-
 						let payment = PaymentDetails {
 							id: payment_id,
-							kind,
+							kind: PaymentKind::Bolt11 {
+								hash: payment_hash,
+								preimage: None,
+								secret: Some(*payment_secret),
+							},
 							amount_msat: Some(amount_msat),
 							direction: PaymentDirection::Outbound,
 							status: PaymentStatus::Failed,
@@ -303,15 +297,14 @@ impl Bolt11Payment {
 
 		let payment_hash = PaymentHash(invoice.payment_hash().to_byte_array());
 		let id = PaymentId(payment_hash.0);
-		let kind = PaymentKind::Bolt11 {
-			hash: payment_hash,
-			preimage: None,
-			secret: Some(invoice.payment_secret().clone()),
-		};
-
 		let payment = PaymentDetails {
 			id,
-			kind,
+			kind: PaymentKind::Bolt11 {
+				hash: payment_hash,
+				preimage: None,
+				secret: Some(invoice.payment_secret().clone()),
+			},
+
 			amount_msat,
 			direction: PaymentDirection::Inbound,
 			status: PaymentStatus::Pending,
@@ -434,15 +427,14 @@ impl Bolt11Payment {
 			max_proportional_opening_fee_ppm_msat: lsp_prop_opening_fee,
 		};
 		let id = PaymentId(payment_hash.0);
-		let kind = PaymentKind::Bolt11Jit {
-			hash: payment_hash,
-			preimage: None,
-			secret: Some(invoice.payment_secret().clone()),
-			lsp_fee_limits,
-		};
 		let payment = PaymentDetails {
 			id,
-			kind,
+			kind: PaymentKind::Bolt11Jit {
+				hash: payment_hash,
+				preimage: None,
+				secret: Some(invoice.payment_secret().clone()),
+				lsp_fee_limits,
+			},
 			amount_msat,
 			direction: PaymentDirection::Inbound,
 			status: PaymentStatus::Pending,

src/payment/spontaneous.rs

@@ -77,14 +77,12 @@ impl SpontaneousPayment {
 			Ok(_hash) => {
 				log_info!(self.logger, "Initiated sending {}msat to {}.", amount_msat, node_id);
 
-				let kind = PaymentKind::Spontaneous {
-					hash: payment_hash,
-					preimage: Some(payment_preimage),
-				};
-
 				let payment = PaymentDetails {
 					id: payment_id,
-					kind,
+					kind: PaymentKind::Spontaneous {
+						hash: payment_hash,
+						preimage: Some(payment_preimage),
+					},
 					status: PaymentStatus::Pending,
 					direction: PaymentDirection::Outbound,
 					amount_msat: Some(amount_msat),
@@ -99,14 +97,13 @@ impl SpontaneousPayment {
 				match e {
 					RetryableSendFailure::DuplicatePayment => Err(Error::DuplicatePayment),
 					_ => {
-						let kind = PaymentKind::Spontaneous {
-							hash: payment_hash,
-							preimage: Some(payment_preimage),
-						};
-
 						let payment = PaymentDetails {
 							id: payment_id,
-							kind,
+							kind: PaymentKind::Spontaneous {
+								hash: payment_hash,
+								preimage: Some(payment_preimage),
+							},
+
 							status: PaymentStatus::Failed,
 							direction: PaymentDirection::Outbound,
 							amount_msat: Some(amount_msat),

src/payment/store.rs

@@ -395,10 +395,9 @@ mod tests {
 			)
 			.is_err());
 
-		let kind = PaymentKind::Bolt11 { hash, preimage: None, secret: None };
 		let payment = PaymentDetails {
 			id,
-			kind,
+			kind: PaymentKind::Bolt11 { hash, preimage: None, secret: None },
 			amount_msat: None,
 			direction: PaymentDirection::Inbound,
 			status: PaymentStatus::Pending,