Account for changes in RecipientOnionFields

Author: tnull

src/lib.rs

@@ -1155,7 +1155,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 		}
 
 		let payment_id = PaymentId(invoice.payment_hash().into_inner());
-		let payment_secret = Some(*invoice.payment_secret());
+		let payment_secret = invoice.payment_secret();
 		let expiry_time = invoice.duration_since_epoch().saturating_add(invoice.expiry_time());
 		let mut payment_params = PaymentParameters::from_node_id(
 			invoice.recover_payee_pub_key(),
@@ -1172,7 +1172,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 		let route_params = RouteParameters { payment_params, final_value_msat: amount_msat };
 
 		let retry_strategy = Retry::Timeout(LDK_PAYMENT_RETRY_TIMEOUT);
-		let recipient_fields = RecipientOnionFields { payment_secret, payment_metadata: None };
+		let recipient_fields = RecipientOnionFields::secret_only(*payment_secret);
 
 		match self
 			.channel_manager
@@ -1191,7 +1191,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 				let payment = PaymentDetails {
 					hash: payment_hash,
 					preimage: None,
-					secret: payment_secret,
+					secret: Some(*payment_secret),
 					amount_msat: Some(amount_msat),
 					direction: PaymentDirection::Outbound,
 					status: PaymentStatus::Pending,
@@ -1215,7 +1215,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 						let payment = PaymentDetails {
 							hash: payment_hash,
 							preimage: None,
-							secret: payment_secret,
+							secret: Some(*payment_secret),
 							amount_msat: Some(amount_msat),
 							direction: PaymentDirection::Outbound,
 							status: PaymentStatus::Failed,