X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fonion_message%2Fmessenger.rs;h=b10bd185100ddfcd03a8ced2d68ef9677b1bf667;hb=2c71923a5add91f984f34d27febdc4d3eed1624f;hp=97fcbfd94afa5e4c3ff7c866cd637392050e5cc3;hpb=8f1dc54e6d8db0b320948fbab57be026f77a0302;p=rust-lightning

diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index 97fcbfd9..b10bd185 100644
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -923,13 +923,12 @@ where
 		&self, contents: T, destination: Destination, reply_path: Option<BlindedPath>,
 		log_suffix: fmt::Arguments
 	) -> Result<SendSuccess, SendError> {
-		let mut logger = WithContext::from(&self.logger, None, None);
-		let result = self.find_path(destination)
-			.and_then(|path| {
-				let first_hop = path.intermediate_nodes.get(0).map(|p| *p);
-				logger = WithContext::from(&self.logger, first_hop, None);
-				self.enqueue_onion_message(path, contents, reply_path, log_suffix)
-			});
+		let mut logger = WithContext::from(&self.logger, None, None, None);
+		let result = self.find_path(destination).and_then(|path| {
+			let first_hop = path.intermediate_nodes.get(0).map(|p| *p);
+			logger = WithContext::from(&self.logger, first_hop, None, None);
+			self.enqueue_onion_message(path, contents, reply_path, log_suffix)
+		});
 
 		match result.as_ref() {
 			Err(SendError::GetNodeIdFailed) => {
@@ -1149,7 +1148,7 @@ where
 	CMH::Target: CustomOnionMessageHandler,
 {
 	fn handle_onion_message(&self, peer_node_id: &PublicKey, msg: &OnionMessage) {
-		let logger = WithContext::from(&self.logger, Some(*peer_node_id), None);
+		let logger = WithContext::from(&self.logger, Some(*peer_node_id), None, None);
 		match self.peel_onion_message(msg) {
 			Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 				log_trace!(