]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Remove unused macro param
authorJeffrey Czyz <jkczyz@gmail.com>
Wed, 31 Jul 2024 21:08:20 +0000 (16:08 -0500)
committerJeffrey Czyz <jkczyz@gmail.com>
Wed, 14 Aug 2024 15:55:58 +0000 (10:55 -0500)
lightning/src/offers/invoice.rs
lightning/src/offers/invoice_macros.rs
lightning/src/offers/static_invoice.rs

index 5a9cb349ce19294fcd2e8a3bdc17dffb4635af13..3fd2e73aa5b46374b506dba39572fc0438d293e0 100644 (file)
@@ -386,7 +386,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
 
 impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
        invoice_builder_methods!(self, Self, Self, self, S, mut);
-       invoice_builder_methods_common!(self, Self, self.invoice.fields_mut(), Self, self, S, Bolt12Invoice, mut);
+       invoice_builder_methods_common!(self, Self, self.invoice.fields_mut(), Self, self, Bolt12Invoice, mut);
 
        #[cfg(test)]
        invoice_builder_methods_test!(self, Self, self.invoice.fields_mut(), Self, self, mut);
@@ -396,14 +396,14 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
 impl<'a> InvoiceWithExplicitSigningPubkeyBuilder<'a> {
        invoice_explicit_signing_pubkey_builder_methods!(self, &mut Self);
        invoice_builder_methods!(self, &mut Self, (), (), ExplicitSigningPubkey);
-       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), (), (), ExplicitSigningPubkey, Bolt12Invoice);
+       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), (), (), Bolt12Invoice);
 }
 
 #[cfg(all(c_bindings, test))]
 impl<'a> InvoiceWithExplicitSigningPubkeyBuilder<'a> {
        invoice_explicit_signing_pubkey_builder_methods!(self, &mut Self);
        invoice_builder_methods!(self, &mut Self, &mut Self, self, ExplicitSigningPubkey);
-       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), &mut Self, self, ExplicitSigningPubkey, Bolt12Invoice);
+       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), &mut Self, self, Bolt12Invoice);
        invoice_builder_methods_test!(self, &mut Self, self.invoice.fields_mut(), &mut Self, self);
 }
 
@@ -411,14 +411,14 @@ impl<'a> InvoiceWithExplicitSigningPubkeyBuilder<'a> {
 impl<'a> InvoiceWithDerivedSigningPubkeyBuilder<'a> {
        invoice_derived_signing_pubkey_builder_methods!(self, &mut Self);
        invoice_builder_methods!(self, &mut Self, (), (), DerivedSigningPubkey);
-       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), (), (), DerivedSigningPubkey, Bolt12Invoice);
+       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), (), (), Bolt12Invoice);
 }
 
 #[cfg(all(c_bindings, test))]
 impl<'a> InvoiceWithDerivedSigningPubkeyBuilder<'a> {
        invoice_derived_signing_pubkey_builder_methods!(self, &mut Self);
        invoice_builder_methods!(self, &mut Self, &mut Self, self, DerivedSigningPubkey);
-       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), &mut Self, self, DerivedSigningPubkey, Bolt12Invoice);
+       invoice_builder_methods_common!(self, &mut Self, self.invoice.fields_mut(), &mut Self, self, Bolt12Invoice);
        invoice_builder_methods_test!(self, &mut Self, self.invoice.fields_mut(), &mut Self, self);
 }
 
index e1875fbc87fc07f45c4d47dcab6883acecb07f3d..c603c352ce9f5604cf7bc5eb75bf7f7d4c1583b6 100644 (file)
@@ -11,7 +11,7 @@
 
 macro_rules! invoice_builder_methods_common { (
        $self: ident, $self_type: ty, $invoice_fields: expr, $return_type: ty, $return_value: expr,
-       $type_param: ty, $invoice_type: ty $(, $self_mut: tt)?
+       $invoice_type: ty $(, $self_mut: tt)?
 ) => {
        #[doc = concat!("Sets the [`", stringify!($invoice_type), "::relative_expiry`]")]
        #[doc = concat!("as seconds since [`", stringify!($invoice_type), "::created_at`].")]
index 614903bdfcc1f125671e58aaa418d4a5c7239282..c91496e17a151a0898943b5940479ec331f0470b 100644 (file)
@@ -156,7 +156,7 @@ impl<'a> StaticInvoiceBuilder<'a> {
                Ok(invoice)
        }
 
-       invoice_builder_methods_common!(self, Self, self.invoice, Self, self, S, StaticInvoice, mut);
+       invoice_builder_methods_common!(self, Self, self.invoice, Self, self, StaticInvoice, mut);
 }
 
 /// A semantically valid [`StaticInvoice`] that hasn't been signed.