fixing problems from reviews

Author: Sharmalm

lightning/src/offers/invoice.rs

@@ -691,10 +691,6 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	pub fn signing_pubkey(&$self) -> PublicKey {
 		$contents.signing_pubkey()
 	}
-
-	pub(crate) fn tlv_stream(&$self) -> PartialInvoiceTlvStreamRef {
-		$contents.as_tlv_stream()
-	}
 } }
 
 impl UnsignedBolt12Invoice {
@@ -722,8 +718,7 @@ impl Bolt12Invoice {
 		self.contents.verify(TlvStream::new(&self.bytes), key, secp_ctx)
 	}
 
-	#[cfg(test)]
-	pub(super) fn as_tlv_stream(&self) -> FullInvoiceTlvStreamRef {
+	pub(crate) fn as_tlv_stream(&self) -> FullInvoiceTlvStreamRef {
 		let (payer_tlv_stream, offer_tlv_stream, invoice_request_tlv_stream, invoice_tlv_stream) =
 			self.contents.as_tlv_stream();
 		let signature_tlv_stream = SignatureTlvStreamRef {
@@ -1157,7 +1152,6 @@ impl_writeable!(FallbackAddress, { version, program });
 type FullInvoiceTlvStream =
 	(PayerTlvStream, OfferTlvStream, InvoiceRequestTlvStream, InvoiceTlvStream, SignatureTlvStream);
 
-#[cfg(test)]
 type FullInvoiceTlvStreamRef<'a> = (
 	PayerTlvStreamRef<'a>,
 	OfferTlvStreamRef<'a>,

lightning/src/offers/invoice_request.rs

@@ -519,10 +519,6 @@ macro_rules! invoice_request_accessors { ($self: ident, $contents: expr) => {
 	pub fn payer_note(&$self) -> Option<PrintableString> {
 		$contents.payer_note()
 	}
-
-	pub(crate) fn tlv_stream(&$self) -> PartialInvoiceRequestTlvStreamRef {
-		$contents.as_tlv_stream()
-	}
 } }
 
 impl UnsignedInvoiceRequest {
@@ -612,8 +608,7 @@ impl InvoiceRequest {
 		})
 	}
 
-	#[cfg(test)]
-	fn as_tlv_stream(&self) -> FullInvoiceRequestTlvStreamRef {
+	pub(crate) fn as_tlv_stream(&self) -> FullInvoiceRequestTlvStreamRef {
 		let (payer_tlv_stream, offer_tlv_stream, invoice_request_tlv_stream) =
 			self.contents.as_tlv_stream();
 		let signature_tlv_stream = SignatureTlvStreamRef {
@@ -815,7 +810,6 @@ tlv_stream!(InvoiceRequestTlvStream, InvoiceRequestTlvStreamRef, INVOICE_REQUEST
 type FullInvoiceRequestTlvStream =
 	(PayerTlvStream, OfferTlvStream, InvoiceRequestTlvStream, SignatureTlvStream);
 
-#[cfg(test)]
 type FullInvoiceRequestTlvStreamRef<'a> = (
 	PayerTlvStreamRef<'a>,
 	OfferTlvStreamRef<'a>,

lightning/src/onion_message/messenger.rs

@@ -56,7 +56,7 @@ use crate::prelude::*;
 ///
 /// # Example
 ///
-/// 
+/// ```
 /// # extern crate bitcoin;
 /// # use bitcoin::hashes::_export::_core::time::Duration;
 /// # use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
@@ -132,7 +132,7 @@ use crate::prelude::*;
 /// let reply_path = None;
 /// # let message = YourCustomMessage {};
 /// onion_messenger.send_onion_message(path, message, reply_path);
-/// 
+/// ```
 ///
 /// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
 /// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
@@ -517,7 +517,7 @@ where
 		&self, path: OnionMessagePath, contents: T, reply_path: Option<BlindedPath>
 	) -> Result<(), SendError> {
 
-		log_trace!(self.logger ,"Sending onion message: {}", message);
+		log_trace!(self.logger, "Sending onion message: {}", message);
 
 		let (introduction_node_id, onion_msg) = create_onion_message(
 			&self.entropy_source, &self.node_signer, &self.secp_ctx,
@@ -583,6 +583,7 @@ where
 			}
 		};
 		log_trace!(self.logger , "Responding to onion message {} with path_id {:02x?}", response , path_id);
+		log_trace!(self.logger, "Responding to onion message {} with path_id {:02x?}", response , path_id);
 
 		if let Err(e) = self.send_onion_message(path, contents, reply_path) {
 			log_trace!(self.logger, "Failed sending onion message {}: {:?}", log_suffix, e);
@@ -643,7 +644,7 @@ where
 			Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 				message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 			}, None)) => {
-				log_trace!(self.logger,"Received an onion message {:?} with path_id {:02x?} and {} reply_path", msg ,
+				log_trace!(self.logger,"Received an onion message {} with path_id {:02x?} and {} reply_path", message,
 						path_id, if reply_path.is_some() { "a" } else { "no" });
 
 				match message {

lightning/src/onion_message/offers.rs

@@ -59,7 +59,7 @@ pub trait OffersMessageHandler {
 /// Possible BOLT 12 Offers messages sent and received via an [`OnionMessage`].
 ///
 /// [`OnionMessage`]: crate::ln::msgs::OnionMessage
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub enum OffersMessage {
 	/// A request for a [`Bolt12Invoice`] for a particular [`Offer`].
 	///
@@ -91,20 +91,22 @@ impl OffersMessage {
 			_ => Err(Bolt12ParseError::Decode(DecodeError::InvalidValue)),
 		}
 	}
+}
 
-	pub(crate) fn format(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+impl fmt::Debug for OffersMessage {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match self {
 			OffersMessage::InvoiceRequest(message) => {
-				write!(f, "InvoiceRequest: {:?}", message.tlv_stream())
+				write!(f, "InvoiceRequest: {:?}", message.as_tlv_stream())
 			}
 			OffersMessage::Invoice(message) => {
-				write!(f, "Invoice: {:?}", message.tlv_stream())
+				write!(f, "Invoice: {:?}", message.as_tlv_stream())
 			}
 			OffersMessage::InvoiceError(message) => {
 				write!(f, "InvoiceError: {:?}", message)
 			}
 		}
-	}
+    }
 }
 
 impl OnionMessageContents for OffersMessage {

lightning/src/onion_message/packet.rs

@@ -23,7 +23,7 @@ use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAda
 use crate::util::logger::Logger;
 use crate::util::ser::{BigSize, FixedLengthReader, LengthRead, LengthReadable, LengthReadableArgs, Readable, ReadableArgs, Writeable, Writer};
 
-use core::{cmp,fmt};
+use core::{cmp, fmt};
 use crate::io::{self, Read};
 use crate::prelude::*;
 
@@ -140,10 +140,10 @@ impl<T: OnionMessageContents> OnionMessageContents for ParsedOnionMessageContent
 impl<T: CustomOnionMessageContents> fmt::Display for OnionMessageContents<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            OnionMessageContents::Offers(msg) => {
+            OnionMessageContents::Offers(ref msg) => {
                 write!(f, " (Offers): {:?}", msg)
             }
-            OnionMessageContents::Custom(msg) => {
+            OnionMessageContents::Custom(ref msg) => {
                 write!(f, " (Custom) : {}", msg.tlv_type())
             }
         }