Skip to content

Commit 95d0adc

Browse files
jkczyzjkczyz
committed
f - remove metadata parameter
1 parent 992e445 commit 95d0adc

File tree

7 files changed

+28
-47
lines changed

7 files changed

+28
-47
lines changed

‎fuzz/src/invoice_request_deser.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
3838
if signing_pubkey == odd_pubkey || signing_pubkey == even_pubkey {
3939
unsigned_invoice
4040
.sign::<_, Infallible>(
41-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
41+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
4242
)
4343
.unwrap()
4444
.write(&mut buffer)
4545
.unwrap();
4646
} else {
4747
unsigned_invoice
4848
.sign::<_, Infallible>(
49-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
49+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
5050
)
5151
.unwrap_err();
5252
}

‎fuzz/src/offer_deser.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
3030
if let Ok(invoice_request) = build_response(&offer, pubkey) {
3131
invoice_request
3232
.sign::<_, Infallible>(
33-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
33+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
3434
)
3535
.unwrap()
3636
.write(&mut buffer)

‎fuzz/src/refund_deser.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
3434
if let Ok(invoice) = build_response(&refund, pubkey, &secp_ctx) {
3535
invoice
3636
.sign::<_, Infallible>(
37-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
37+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
3838
)
3939
.unwrap()
4040
.write(&mut buffer)

‎lightning/src/offers/invoice.rs‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
//! .allow_mpp()
5656
//! .fallback_v0_p2wpkh(&wpubkey_hash)
5757
//! .build()?
58-
//! .sign::<_, Infallible>(|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys)))
58+
//! .sign::<_, Infallible>(|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys)))
5959
//! .expect("failed verifying signature")
6060
//! .write(&mut buffer)
6161
//! .unwrap();
@@ -84,7 +84,7 @@
8484
//! .allow_mpp()
8585
//! .fallback_v0_p2wpkh(&wpubkey_hash)
8686
//! .build()?
87-
//! .sign::<_, Infallible>(|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys)))
87+
//! .sign::<_, Infallible>(|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys)))
8888
//! .expect("failed verifying signature")
8989
//! .write(&mut buffer)
9090
//! .unwrap();
@@ -361,7 +361,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
361361
let keys = keys.unwrap();
362362
let invoice = unsigned_invoice
363363
.sign::<_, Infallible>(
364-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
364+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
365365
)
366366
.unwrap();
367367
Ok(invoice)
@@ -385,7 +385,7 @@ impl<'a> UnsignedBolt12Invoice<'a> {
385385
/// This is not exported to bindings users as functions aren't currently mapped.
386386
pub fn sign<F, E>(self, sign: F) -> Result<Bolt12Invoice, SignError<E>>
387387
where
388-
F: FnOnce(&TaggedHash, &[u8]) -> Result<Signature, E>
388+
F: FnOnce(&TaggedHash) -> Result<Signature, E>
389389
{
390390
// Use the invoice_request bytes instead of the invoice_request TLV stream as the latter may
391391
// have contained unknown TLV records, which are not stored in `InvoiceRequestContents` or
@@ -398,9 +398,8 @@ impl<'a> UnsignedBolt12Invoice<'a> {
398398
unsigned_tlv_stream.write(&mut bytes).unwrap();
399399

400400
let message = TaggedHash::new(SIGNATURE_TAG, &bytes);
401-
let metadata = self.invoice.metadata();
402401
let pubkey = self.invoice.fields().signing_pubkey;
403-
let signature = merkle::sign_message(sign, message, metadata, pubkey)?;
402+
let signature = merkle::sign_message(sign, message, pubkey)?;
404403

405404
// Append the signature TLV record to the bytes.
406405
let signature_tlv_stream = SignatureTlvStreamRef {
@@ -616,13 +615,6 @@ impl Bolt12Invoice {
616615
}
617616

618617
impl InvoiceContents {
619-
fn metadata(&self) -> &[u8] {
620-
match self {
621-
InvoiceContents::ForOffer { invoice_request, .. } => invoice_request.metadata(),
622-
InvoiceContents::ForRefund { refund, .. } => refund.metadata(),
623-
}
624-
}
625-
626618
/// Whether the original offer or refund has expired.
627619
#[cfg(feature = "std")]
628620
fn is_offer_or_refund_expired(&self) -> bool {
@@ -1472,7 +1464,7 @@ mod tests {
14721464
.sign(payer_sign).unwrap()
14731465
.respond_with_no_std(payment_paths(), payment_hash(), now()).unwrap()
14741466
.build().unwrap()
1475-
.sign(|_, _| Err(()))
1467+
.sign(|_| Err(()))
14761468
{
14771469
Ok(_) => panic!("expected error"),
14781470
Err(e) => assert_eq!(e, SignError::Signing(())),

‎lightning/src/offers/invoice_request.rs‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
//! .quantity(5)?
4545
//! .payer_note("foo".to_string())
4646
//! .build()?
47-
//! .sign::<_, Infallible>(|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys)))
47+
//! .sign::<_, Infallible>(|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys)))
4848
//! .expect("failed verifying signature")
4949
//! .write(&mut buffer)
5050
//! .unwrap();
@@ -308,7 +308,7 @@ impl<'a, 'b, T: secp256k1::Signing> InvoiceRequestBuilder<'a, 'b, DerivedPayerId
308308
let keys = keys.unwrap();
309309
let invoice_request = unsigned_invoice_request
310310
.sign::<_, Infallible>(
311-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
311+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
312312
)
313313
.unwrap();
314314
Ok(invoice_request)
@@ -355,7 +355,7 @@ impl<'a> UnsignedInvoiceRequest<'a> {
355355
/// This is not exported to bindings users as functions are not yet mapped.
356356
pub fn sign<F, E>(self, sign: F) -> Result<InvoiceRequest, SignError<E>>
357357
where
358-
F: FnOnce(&TaggedHash, &[u8]) -> Result<Signature, E>
358+
F: FnOnce(&TaggedHash) -> Result<Signature, E>
359359
{
360360
// Use the offer bytes instead of the offer TLV stream as the offer may have contained
361361
// unknown TLV records, which are not stored in `OfferContents`.
@@ -368,9 +368,8 @@ impl<'a> UnsignedInvoiceRequest<'a> {
368368
unsigned_tlv_stream.write(&mut bytes).unwrap();
369369

370370
let message = TaggedHash::new(SIGNATURE_TAG, &bytes);
371-
let metadata = self.offer.metadata().map(|metadata| metadata.as_slice()).unwrap_or(&[]);
372371
let pubkey = self.invoice_request.payer_id;
373-
let signature = merkle::sign_message(sign, message, metadata, pubkey)?;
372+
let signature = merkle::sign_message(sign, message, pubkey)?;
374373

375374
// Append the signature TLV record to the bytes.
376375
let signature_tlv_stream = SignatureTlvStreamRef {
@@ -928,9 +927,7 @@ mod tests {
928927
tlv_stream.write(&mut bytes).unwrap();
929928

930929
let message = TaggedHash::new(INVOICE_SIGNATURE_TAG, &bytes);
931-
let signature = merkle::sign_message(
932-
recipient_sign, message, invoice_request.metadata(), recipient_pubkey()
933-
).unwrap();
930+
let signature = merkle::sign_message(recipient_sign, message, recipient_pubkey()).unwrap();
934931
signature_tlv_stream.signature = Some(&signature);
935932

936933
let mut encoded_invoice = bytes;
@@ -953,9 +950,7 @@ mod tests {
953950
tlv_stream.write(&mut bytes).unwrap();
954951

955952
let message = TaggedHash::new(INVOICE_SIGNATURE_TAG, &bytes);
956-
let signature = merkle::sign_message(
957-
recipient_sign, message, &metadata, recipient_pubkey()
958-
).unwrap();
953+
let signature = merkle::sign_message(recipient_sign, message, recipient_pubkey()).unwrap();
959954
signature_tlv_stream.signature = Some(&signature);
960955

961956
let mut encoded_invoice = bytes;
@@ -1000,9 +995,7 @@ mod tests {
1000995
tlv_stream.write(&mut bytes).unwrap();
1001996

1002997
let message = TaggedHash::new(INVOICE_SIGNATURE_TAG, &bytes);
1003-
let signature = merkle::sign_message(
1004-
recipient_sign, message, invoice_request.metadata(), recipient_pubkey()
1005-
).unwrap();
998+
let signature = merkle::sign_message(recipient_sign, message, recipient_pubkey()).unwrap();
1006999
signature_tlv_stream.signature = Some(&signature);
10071000

10081001
let mut encoded_invoice = bytes;
@@ -1025,9 +1018,7 @@ mod tests {
10251018
tlv_stream.write(&mut bytes).unwrap();
10261019

10271020
let message = TaggedHash::new(INVOICE_SIGNATURE_TAG, &bytes);
1028-
let signature = merkle::sign_message(
1029-
recipient_sign, message, invoice_request.metadata(), recipient_pubkey()
1030-
).unwrap();
1021+
let signature = merkle::sign_message(recipient_sign, message, recipient_pubkey()).unwrap();
10311022
signature_tlv_stream.signature = Some(&signature);
10321023

10331024
let mut encoded_invoice = bytes;
@@ -1366,7 +1357,7 @@ mod tests {
13661357
.build().unwrap()
13671358
.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
13681359
.build().unwrap()
1369-
.sign(|_, _| Err(()))
1360+
.sign(|_| Err(()))
13701361
{
13711362
Ok(_) => panic!("expected error"),
13721363
Err(e) => assert_eq!(e, SignError::Signing(())),
@@ -1781,7 +1772,7 @@ mod tests {
17811772
.request_invoice(vec![1; 32], keys.public_key()).unwrap()
17821773
.build().unwrap()
17831774
.sign::<_, Infallible>(
1784-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
1775+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
17851776
)
17861777
.unwrap();
17871778

‎lightning/src/offers/merkle.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ pub enum SignError<E> {
7676
///
7777
/// Panics if `message` does not contain a well-formed TLV stream with at least one TLV record.
7878
pub(super) fn sign_message<F, E>(
79-
sign: F, message: TaggedHash, metadata: &[u8], pubkey: PublicKey,
79+
sign: F, message: TaggedHash, pubkey: PublicKey,
8080
) -> Result<Signature, SignError<E>>
8181
where
82-
F: FnOnce(&TaggedHash, &[u8]) -> Result<Signature, E>
82+
F: FnOnce(&TaggedHash) -> Result<Signature, E>
8383
{
84-
let signature = sign(&message, metadata).map_err(|e| SignError::Signing(e))?;
84+
let signature = sign(&message).map_err(|e| SignError::Signing(e))?;
8585

8686
let pubkey = pubkey.into();
8787
let secp_ctx = Secp256k1::verification_only();
@@ -310,7 +310,7 @@ mod tests {
310310
.request_invoice(vec![0; 8], payer_keys.public_key()).unwrap()
311311
.build_unchecked()
312312
.sign::<_, Infallible>(
313-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &payer_keys))
313+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &payer_keys))
314314
)
315315
.unwrap();
316316
assert_eq!(
@@ -345,7 +345,7 @@ mod tests {
345345
.request_invoice(vec![0; 8], payer_keys.public_key()).unwrap()
346346
.build_unchecked()
347347
.sign::<_, Infallible>(
348-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &payer_keys))
348+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &payer_keys))
349349
)
350350
.unwrap();
351351

@@ -377,7 +377,7 @@ mod tests {
377377
.request_invoice(vec![0; 8], payer_keys.public_key()).unwrap()
378378
.build_unchecked()
379379
.sign::<_, Infallible>(
380-
|message, _| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &payer_keys))
380+
|message| Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &payer_keys))
381381
)
382382
.unwrap();
383383

‎lightning/src/offers/test_utils.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub(super) fn payer_keys() -> KeyPair {
2525
KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap())
2626
}
2727

28-
pub(super) fn payer_sign(message: &TaggedHash, _metadata: &[u8]) -> Result<Signature, Infallible> {
28+
pub(super) fn payer_sign(message: &TaggedHash) -> Result<Signature, Infallible> {
2929
let secp_ctx = Secp256k1::new();
3030
let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
3131
Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))
@@ -40,9 +40,7 @@ pub(super) fn recipient_keys() -> KeyPair {
4040
KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap())
4141
}
4242

43-
pub(super) fn recipient_sign(
44-
message: &TaggedHash, _metadata: &[u8]
45-
) -> Result<Signature, Infallible> {
43+
pub(super) fn recipient_sign(message: &TaggedHash) -> Result<Signature, Infallible> {
4644
let secp_ctx = Secp256k1::new();
4745
let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap());
4846
Ok(secp_ctx.sign_schnorr_no_aux_rand(&message.to_digest(), &keys))

0 commit comments

Comments
 (0)