Skip to content

Commit c05f422

Browse files
jkczyzjkczyz
committed
Rename InvoiceRequest::payer_id
For consistency with Offer::issuer_signing_pubkey, rename InvoiceRequest::payer_id to use "signing_pubkey" instead of "id".
1 parent 66e533a commit c05f422

File tree

10 files changed

+161
-160
lines changed

10 files changed

+161
-160
lines changed

‎fuzz/src/invoice_request_deser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ fn build_response<T: secp256k1::Signing + secp256k1::Verification>(
8686
let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext {
8787
offer_id: OfferId([42; 32]),
8888
invoice_request: InvoiceRequestFields {
89-
payer_id: invoice_request.payer_id(),
89+
payer_signing_pubkey: invoice_request.payer_signing_pubkey(),
9090
quantity: invoice_request.quantity(),
9191
payer_note_truncated: invoice_request
9292
.payer_note()

‎lightning/src/ln/channelmanager.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutb
6363
use crate::ln::wire::Encode;
6464
use crate::offers::invoice::{BlindedPayInfo, Bolt12Invoice, DEFAULT_RELATIVE_EXPIRY, DerivedSigningPubkey, ExplicitSigningPubkey, InvoiceBuilder, UnsignedBolt12Invoice};
6565
use crate::offers::invoice_error::InvoiceError;
66-
use crate::offers::invoice_request::{DerivedPayerId, InvoiceRequestBuilder};
66+
use crate::offers::invoice_request::{DerivedPayerSigningPubkey, InvoiceRequestBuilder};
6767
use crate::offers::nonce::Nonce;
6868
use crate::offers::offer::{Offer, OfferBuilder};
6969
use crate::offers::parse::Bolt12SemanticError;
@@ -9002,8 +9002,8 @@ where
90029002
let secp_ctx = &self.secp_ctx;
90039003

90049004
let nonce = Nonce::from_entropy_source(entropy);
9005-
let builder: InvoiceRequestBuilder<DerivedPayerId, secp256k1::All> = offer
9006-
.request_invoice_deriving_payer_id(expanded_key, nonce, secp_ctx, payment_id)?
9005+
let builder: InvoiceRequestBuilder<DerivedPayerSigningPubkey, secp256k1::All> = offer
9006+
.request_invoice_deriving_signing_pubkey(expanded_key, nonce, secp_ctx, payment_id)?
90079007
.into();
90089008
let builder = builder.chain_hash(self.chain_hash)?;
90099009

‎lightning/src/ln/offers_tests.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -551,13 +551,13 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
551551
let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext {
552552
offer_id: offer.id(),
553553
invoice_request: InvoiceRequestFields {
554-
payer_id: invoice_request.payer_id(),
554+
payer_signing_pubkey: invoice_request.payer_signing_pubkey(),
555555
quantity: None,
556556
payer_note_truncated: None,
557557
},
558558
});
559559
assert_eq!(invoice_request.amount_msats(), None);
560-
assert_ne!(invoice_request.payer_id(), david_id);
560+
assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
561561
assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(charlie_id));
562562

563563
let onion_message = alice.onion_messenger.next_onion_message_for_peer(charlie_id).unwrap();
@@ -700,13 +700,13 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
700700
let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext {
701701
offer_id: offer.id(),
702702
invoice_request: InvoiceRequestFields {
703-
payer_id: invoice_request.payer_id(),
703+
payer_signing_pubkey: invoice_request.payer_signing_pubkey(),
704704
quantity: None,
705705
payer_note_truncated: None,
706706
},
707707
});
708708
assert_eq!(invoice_request.amount_msats(), None);
709-
assert_ne!(invoice_request.payer_id(), bob_id);
709+
assert_ne!(invoice_request.payer_signing_pubkey(), bob_id);
710710
assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(bob_id));
711711

712712
let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
@@ -818,7 +818,7 @@ fn pays_for_offer_without_blinded_paths() {
818818
let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext {
819819
offer_id: offer.id(),
820820
invoice_request: InvoiceRequestFields {
821-
payer_id: invoice_request.payer_id(),
821+
payer_signing_pubkey: invoice_request.payer_signing_pubkey(),
822822
quantity: None,
823823
payer_note_truncated: None,
824824
},
@@ -1076,7 +1076,7 @@ fn pays_bolt12_invoice_asynchronously() {
10761076
let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext {
10771077
offer_id: offer.id(),
10781078
invoice_request: InvoiceRequestFields {
1079-
payer_id: invoice_request.payer_id(),
1079+
payer_signing_pubkey: invoice_request.payer_signing_pubkey(),
10801080
quantity: None,
10811081
payer_note_truncated: None,
10821082
},
@@ -1165,12 +1165,12 @@ fn creates_offer_with_blinded_path_using_unannounced_introduction_node() {
11651165
let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext {
11661166
offer_id: offer.id(),
11671167
invoice_request: InvoiceRequestFields {
1168-
payer_id: invoice_request.payer_id(),
1168+
payer_signing_pubkey: invoice_request.payer_signing_pubkey(),
11691169
quantity: None,
11701170
payer_note_truncated: None,
11711171
},
11721172
});
1173-
assert_ne!(invoice_request.payer_id(), bob_id);
1173+
assert_ne!(invoice_request.payer_signing_pubkey(), bob_id);
11741174
assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(alice_id));
11751175

11761176
let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
@@ -1313,7 +1313,7 @@ fn fails_authentication_when_handling_invoice_request() {
13131313

13141314
let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
13151315
assert_eq!(invoice_request.amount_msats(), None);
1316-
assert_ne!(invoice_request.payer_id(), david_id);
1316+
assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
13171317
assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(charlie_id));
13181318

13191319
assert_eq!(alice.onion_messenger.next_onion_message_for_peer(charlie_id), None);
@@ -1346,7 +1346,7 @@ fn fails_authentication_when_handling_invoice_request() {
13461346

13471347
let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
13481348
assert_eq!(invoice_request.amount_msats(), None);
1349-
assert_ne!(invoice_request.payer_id(), david_id);
1349+
assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
13501350
assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(charlie_id));
13511351

13521352
assert_eq!(alice.onion_messenger.next_onion_message_for_peer(charlie_id), None);
@@ -1451,7 +1451,7 @@ fn fails_authentication_when_handling_invoice_for_offer() {
14511451

14521452
let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
14531453
assert_eq!(invoice_request.amount_msats(), None);
1454-
assert_ne!(invoice_request.payer_id(), david_id);
1454+
assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
14551455
assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(charlie_id));
14561456

14571457
let onion_message = alice.onion_messenger.next_onion_message_for_peer(charlie_id).unwrap();

‎lightning/src/offers/invoice.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,8 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
740740
/// refund in case there are no [`message_paths`].
741741
///
742742
/// [`message_paths`]: Self::message_paths
743-
pub fn payer_id(&$self) -> PublicKey {
744-
$contents.payer_id()
743+
pub fn payer_signing_pubkey(&$self) -> PublicKey {
744+
$contents.payer_signing_pubkey()
745745
}
746746

747747
/// A payer-provided note reflected back in the invoice.
@@ -1008,10 +1008,10 @@ impl InvoiceContents {
10081008
}
10091009
}
10101010

1011-
fn payer_id(&self) -> PublicKey {
1011+
fn payer_signing_pubkey(&self) -> PublicKey {
10121012
match self {
1013-
InvoiceContents::ForOffer { invoice_request, .. } => invoice_request.payer_id(),
10141013
InvoiceContents::ForRefund { refund, .. } => refund.payer_id(),
1014+
InvoiceContents::ForOffer { invoice_request, .. } => invoice_request.payer_signing_pubkey(),
10151015
}
10161016
}
10171017

@@ -1090,9 +1090,9 @@ impl InvoiceContents {
10901090
});
10911091
let tlv_stream = offer_records.chain(invreq_records);
10921092

1093-
let payer_id = self.payer_id();
1093+
let signing_pubkey = self.payer_signing_pubkey();
10941094
signer::verify_payer_metadata(
1095-
metadata.as_ref(), key, iv_bytes, payer_id, tlv_stream, secp_ctx,
1095+
metadata.as_ref(), key, iv_bytes, signing_pubkey, tlv_stream, secp_ctx,
10961096
)
10971097
}
10981098

@@ -1550,7 +1550,7 @@ mod tests {
15501550
assert_eq!(unsigned_invoice.amount_msats(), 1000);
15511551
assert_eq!(unsigned_invoice.invoice_request_features(), &InvoiceRequestFeatures::empty());
15521552
assert_eq!(unsigned_invoice.quantity(), None);
1553-
assert_eq!(unsigned_invoice.payer_id(), payer_pubkey());
1553+
assert_eq!(unsigned_invoice.payer_signing_pubkey(), payer_pubkey());
15541554
assert_eq!(unsigned_invoice.payer_note(), None);
15551555
assert_eq!(unsigned_invoice.payment_paths(), payment_paths.as_slice());
15561556
assert_eq!(unsigned_invoice.created_at(), now);
@@ -1592,7 +1592,7 @@ mod tests {
15921592
assert_eq!(invoice.amount_msats(), 1000);
15931593
assert_eq!(invoice.invoice_request_features(), &InvoiceRequestFeatures::empty());
15941594
assert_eq!(invoice.quantity(), None);
1595-
assert_eq!(invoice.payer_id(), payer_pubkey());
1595+
assert_eq!(invoice.payer_signing_pubkey(), payer_pubkey());
15961596
assert_eq!(invoice.payer_note(), None);
15971597
assert_eq!(invoice.payment_paths(), payment_paths.as_slice());
15981598
assert_eq!(invoice.created_at(), now);
@@ -1690,7 +1690,7 @@ mod tests {
16901690
assert_eq!(invoice.amount_msats(), 1000);
16911691
assert_eq!(invoice.invoice_request_features(), &InvoiceRequestFeatures::empty());
16921692
assert_eq!(invoice.quantity(), None);
1693-
assert_eq!(invoice.payer_id(), payer_pubkey());
1693+
assert_eq!(invoice.payer_signing_pubkey(), payer_pubkey());
16941694
assert_eq!(invoice.payer_note(), None);
16951695
assert_eq!(invoice.payment_paths(), payment_paths.as_slice());
16961696
assert_eq!(invoice.created_at(), now);

0 commit comments

Comments
 (0)