improved minor changes

Author: Sharmalm

lightning/src/offers/invoice.rs

@@ -1002,7 +1002,7 @@ impl InvoiceContents {
 		}
 	}
 
-	pub(crate) fn as_tlv_stream(&self) -> PartialInvoiceTlvStreamRef {
+	fn as_tlv_stream(&self) -> PartialInvoiceTlvStreamRef {
 		let (payer, offer, invoice_request) = match self {
 			InvoiceContents::ForOffer { invoice_request, .. } => invoice_request.as_tlv_stream(),
 			InvoiceContents::ForRefund { refund, .. } => refund.as_tlv_stream(),

lightning/src/offers/invoice_request.rs

@@ -731,7 +731,7 @@ impl InvoiceRequestContents {
 			.map(|payer_note| PrintableString(payer_note.as_str()))
 	}
 
-	pub(crate) fn as_tlv_stream(&self) -> PartialInvoiceRequestTlvStreamRef {
+	pub(super) fn as_tlv_stream(&self) -> PartialInvoiceRequestTlvStreamRef {
 		let (payer, offer, mut invoice_request) = self.inner.as_tlv_stream();
 		invoice_request.payer_id = Some(&self.payer_id);
 		(payer, offer, invoice_request)
@@ -747,7 +747,7 @@ impl InvoiceRequestContentsWithoutPayerId {
 		self.chain.unwrap_or_else(|| self.offer.implied_chain())
 	}
 
-	pub(crate) fn as_tlv_stream(&self) -> PartialInvoiceRequestTlvStreamRef {
+	pub(super) fn as_tlv_stream(&self) -> PartialInvoiceRequestTlvStreamRef {
 		let payer = PayerTlvStreamRef {
 			metadata: self.payer.0.as_bytes(),
 		};

lightning/src/onion_message/messenger.rs

@@ -70,9 +70,7 @@ use crate::prelude::*;
 /// # use std::sync::Arc;
 /// # struct FakeLogger;
 /// # impl Logger for FakeLogger {
-/// #     fn log(&self, record: &Record) {
-/// #     println!("{:?}" , record); 
-/// #     }
+/// #     fn log(&self, record: &Record) { println!("{:?}" , record); }
 /// # }
 /// # struct FakeMessageRouter {}
 /// # impl MessageRouter for FakeMessageRouter {
@@ -519,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,
@@ -575,17 +573,7 @@ where
 			},
 		};
 
-		log_trace!(self.logger, "Sending onion message {}", log_suffix);
-		match &response {
-			OnionMessageContents::Offers(ref offers_msg) => {
-				log_trace!(self.logger, "Respoding to onion message {:?} with path_id {:02x?}", offers_msg , path_id);
-			}
-			OnionMessageContents::Custom(ref custom_msg) => {
-				log_trace!(self.logger, "Respoding to onion message {} with path_id {:02x?}", custom_msg.tlv_type() , path_id);
-			}
-		};
-		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);
+		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);
@@ -646,7 +634,8 @@ 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", message,
+				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

@@ -10,6 +10,7 @@
 //! Message handling for BOLT 12 Offers.
 
 use core::convert::TryFrom;
+use core::fmt;
 use crate::io::{self, Read};
 use crate::ln::msgs::DecodeError;
 use crate::offers::invoice_error::InvoiceError;
@@ -22,7 +23,6 @@ use crate::util::logger::Logger;
 use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 
 use crate::prelude::*;
-use core::{fmt};
 
 // TLV record types for the `onionmsg_tlv` TLV stream as defined in BOLT 4.
 const INVOICE_REQUEST_TLV_TYPE: u64 = 64;
@@ -97,16 +97,16 @@ impl fmt::Debug for OffersMessage {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match self {
 			OffersMessage::InvoiceRequest(message) => {
-				write!(f, "InvoiceRequest: {:?}", message.as_tlv_stream())
+				write!(f , "{:?}", message.as_tlv_stream())
 			}
 			OffersMessage::Invoice(message) => {
-				write!(f, "Invoice: {:?}", message.as_tlv_stream())
+				write!(f, "{:?}", message.as_tlv_stream())
 			}
 			OffersMessage::InvoiceError(message) => {
-				write!(f, "InvoiceError: {:?}", message)
+				write!(f, "{:?}", message)
 			}
 		}
-    }
+	}
 }
 
 impl OnionMessageContents for OffersMessage {

lightning/src/onion_message/packet.rs

@@ -114,11 +114,10 @@ pub(super) enum Payload<T: OnionMessageContents> {
 	}
 }
 
-/// The contents of an [`OnionMessage`] as read from the wire.
-///
-/// [`OnionMessage`]: crate::ln::msgs::OnionMessage
-#[derive(Debug)]
-pub enum ParsedOnionMessageContents<T: OnionMessageContents> {
+// #[derive(Debug)]
+/// The contents of an onion message. In the context of offers, this would be the invoice, invoice
+/// request, or invoice error.
+pub enum OnionMessageContents<T: CustomOnionMessageContents> {
 	/// A message related to BOLT 12 Offers.
 	Offers(OffersMessage),
 	/// A custom onion message specified by the user.
@@ -137,7 +136,7 @@ impl<T: OnionMessageContents> OnionMessageContents for ParsedOnionMessageContent
 	}
 }
 
-impl<T: CustomOnionMessageContents> fmt::Display for OnionMessageContents<T> {
+impl<T: CustomOnionMessageContents> fmt::Debug for OnionMessageContents<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             OnionMessageContents::Offers(ref msg) => {