Refactor logging in do_accept_inbound_channel function to include context

Author: Jossec101

lightning/src/ln/channelmanager.rs

@@ -6002,6 +6002,8 @@ where
 	}
 
 	fn do_accept_inbound_channel(&self, temporary_channel_id: &ChannelId, counterparty_node_id: &PublicKey, accept_0conf: bool, user_channel_id: u128) -> Result<(), APIError> {
+
+		let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*temporary_channel_id));
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);
 
 		let peers_without_funded_channels =
@@ -6010,7 +6012,7 @@ where
 		let peer_state_mutex = per_peer_state.get(counterparty_node_id)
 		.ok_or_else(|| {
 			let err_str = format!("Can't find a peer matching the passed counterparty node_id {}", counterparty_node_id); 
-			log_error!(self.logger, "{}", err_str);
+			log_error!(logger, "{}", err_str);
 
 			APIError::ChannelUnavailable { err: err_str } 
 		})?;
@@ -6030,14 +6032,14 @@ where
 					&unaccepted_channel.open_channel_msg, user_channel_id, &self.default_configuration, best_block_height,
 					&self.logger, accept_0conf).map_err(|e| {
 						let err_str = e.to_string();
-						log_error!(self.logger, "{}", err_str);
+						log_error!(logger, "{}", err_str);
 
 						APIError::ChannelUnavailable { err: err_str }
 					})
 				}
 			_ => { 
 				let err_str = "No such channel awaiting to be accepted.".to_owned();
-				log_error!(self.logger, "{}", err_str);
+				log_error!(logger, "{}", err_str);
 
 				Err(APIError::APIMisuseError { err: err_str })
 			}
@@ -6055,7 +6057,7 @@ where
 			};
 			peer_state.pending_msg_events.push(send_msg_err_event);
 			let err_str = "Please use accept_inbound_channel_from_trusted_peer_0conf to accept channels with zero confirmations.".to_owned();
-			log_error!(self.logger, "{}", err_str);
+			log_error!(logger, "{}", err_str);
 
 			return Err(APIError::APIMisuseError { err: err_str });
 		} else {
@@ -6071,7 +6073,7 @@ where
 				};
 				peer_state.pending_msg_events.push(send_msg_err_event);
 				let err_str = "Too many peers with unfunded channels, refusing to accept new ones".to_owned();
-				log_error!(self.logger, "{}", err_str);
+				log_error!(logger, "{}", err_str);
 
 				return Err(APIError::APIMisuseError { err: err_str });
 			}