f Account for new variants, don't register payment in receive

Author: tnull

src/payment/bolt12.rs

@@ -88,7 +88,12 @@ impl Bolt12Payment {
 					payee_pubkey
 				);
 
-				let kind = PaymentKind::Bolt12 { hash: None, preimage: None, secret: None };
+				let kind = PaymentKind::Bolt12Offer {
+					hash: None,
+					preimage: None,
+					secret: None,
+					offer_id: offer.id(),
+				};
 				let payment = PaymentDetails {
 					id: payment_id,
 					kind,
@@ -105,7 +110,12 @@ impl Bolt12Payment {
 				match e {
 					Bolt12SemanticError::DuplicatePaymentId => Err(Error::DuplicatePayment),
 					_ => {
-						let kind = PaymentKind::Bolt12 { hash: None, preimage: None, secret: None };
+						let kind = PaymentKind::Bolt12Offer {
+							hash: None,
+							preimage: None,
+							secret: None,
+							offer_id: offer.id(),
+						};
 						let payment = PaymentDetails {
 							id: payment_id,
 							kind,
@@ -181,7 +191,12 @@ impl Bolt12Payment {
 					payee_pubkey
 				);
 
-				let kind = PaymentKind::Bolt12 { hash: None, preimage: None, secret: None };
+				let kind = PaymentKind::Bolt12Offer {
+					hash: None,
+					preimage: None,
+					secret: None,
+					offer_id: offer.id(),
+				};
 				let payment = PaymentDetails {
 					id: payment_id,
 					kind,
@@ -198,7 +213,12 @@ impl Bolt12Payment {
 				match e {
 					Bolt12SemanticError::DuplicatePaymentId => Err(Error::DuplicatePayment),
 					_ => {
-						let kind = PaymentKind::Bolt12 { hash: None, preimage: None, secret: None };
+						let kind = PaymentKind::Bolt12Offer {
+							hash: None,
+							preimage: None,
+							secret: None,
+							offer_id: offer.id(),
+						};
 						let payment = PaymentDetails {
 							id: payment_id,
 							kind,
@@ -230,17 +250,6 @@ impl Bolt12Payment {
 				Error::OfferCreationFailed
 			})?;
 
-		let id = PaymentId(offer.id().0);
-		let payment = PaymentDetails {
-			id,
-			kind: PaymentKind::Bolt12 { hash: None, preimage: None, secret: None },
-			amount_msat: Some(amount_msat),
-			direction: PaymentDirection::Inbound,
-			status: PaymentStatus::Pending,
-		};
-
-		self.payment_store.insert(payment)?;
-
 		Ok(offer)
 	}
 
@@ -256,17 +265,6 @@ impl Bolt12Payment {
 			Error::OfferCreationFailed
 		})?;
 
-		let id = PaymentId(offer.id().0);
-		let payment = PaymentDetails {
-			id,
-			kind: PaymentKind::Bolt12 { hash: None, preimage: None, secret: None },
-			amount_msat: None,
-			direction: PaymentDirection::Inbound,
-			status: PaymentStatus::Pending,
-		};
-
-		self.payment_store.insert(payment)?;
-
 		Ok(offer)
 	}
 }