Merge pull request #3004 from TheBlueMatt/2024-04-2761-followups

#2761 Followups

diff --combined lightning/src/sign/mod.rs
index 988acf7cc53d48a0dbc7d9e4ed39f572bf6381fc,3634f84aa0e5ca3327417dfec909b70b9d42c316..1710fe65c86c40f18f6616fcc4477526d3725dc9
--- 1/lightning/src/sign/mod.rs
--- 2/lightning/src/sign/mod.rs
+++ b/lightning/src/sign/mod.rs
@@@ -110,8 -110,8 +110,8 @@@ pub struct DelayedPaymentOutputDescript
        pub channel_keys_id: [u8; 32],
        /// The value of the channel which this output originated from, possibly indirectly.
        pub channel_value_satoshis: u64,
-       /// The channel public keys and other parameters needed to generate a spending transaction or to provide to a re-derived signer through
-       /// [`ChannelSigner::provide_channel_parameters`].
+       /// The channel public keys and other parameters needed to generate a spending transaction or
+       /// to provide to a re-derived signer through [`ChannelSigner::provide_channel_parameters`].
        ///
        /// Added as optional, but always `Some` if the descriptor was produced in v0.0.123 or later.
        pub channel_transaction_parameters: Option<ChannelTransactionParameters>,
@@@ -144,10 -144,6 +144,10 @@@ pub(crate) const P2WPKH_WITNESS_WEIGHT
        1 /* pubkey length */ +
        33 /* pubkey */;
  
 +/// Witness weight for satisying a P2TR key-path spend.
 +pub(crate) const P2TR_KEY_PATH_WITNESS_WEIGHT: u64 = 1 /* witness items */
 +      + 1 /* schnorr sig len */ + 64 /* schnorr sig */;
 +
  /// Information about a spendable output to our "payment key".
  ///
  /// See [`SpendableOutputDescriptor::StaticPaymentOutput`] for more details on how to spend this.
@@@ -405,7 -401,7 +405,7 @@@ impl SpendableOutputDescriptor 
                                                                        subtype: 0,
                                                                        key: "add_tweak".as_bytes().to_vec(),
                                                                },
-                                                               add_tweak.to_vec(),
+                                                               add_tweak.as_byte_array().to_vec(),
                                                        )]
                                                        .into_iter()
                                                        .collect()