Allow users to specify the `PaymentId` used in `InvoicePayer`

[rust-lightning] / lightning-invoice / src / utils.rs

diff --git a/lightning-invoice/src/utils.rs b/lightning-invoice/src/utils.rs
index 1ef7cdee0d46e8ad3e7dcf6d1fcdf70d8fd4ecc8..cf397ee5c36a290cd420ff016c6627c42664d936 100644 (file)
--- a/lightning-invoice/src/utils.rs
+++ b/lightning-invoice/src/utils.rs
@@ -602,18 +602,16 @@ where
        }
 
        fn send_payment(
-               &self, route: &Route, payment_hash: PaymentHash, payment_secret: &Option<PaymentSecret>
-       ) -> Result<PaymentId, PaymentSendFailure> {
-               let payment_id = PaymentId(payment_hash.0);
-               self.send_payment(route, payment_hash, payment_secret, payment_id).map(|()| payment_id)
+               &self, route: &Route, payment_hash: PaymentHash, payment_secret: &Option<PaymentSecret>,
+               payment_id: PaymentId
+       ) -> Result<(), PaymentSendFailure> {
+               self.send_payment(route, payment_hash, payment_secret, payment_id)
        }
 
        fn send_spontaneous_payment(
-               &self, route: &Route, payment_preimage: PaymentPreimage,
-       ) -> Result<PaymentId, PaymentSendFailure> {
-               let payment_id = PaymentId(sha256::Hash::hash(&payment_preimage.0).into_inner());
-               self.send_spontaneous_payment(route, Some(payment_preimage), payment_id)
-                       .map(|_| payment_id)
+               &self, route: &Route, payment_preimage: PaymentPreimage, payment_id: PaymentId,
+       ) -> Result<(), PaymentSendFailure> {
+               self.send_spontaneous_payment(route, Some(payment_preimage), payment_id).map(|_| ())
        }
 
        fn retry_payment(