X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmanager.rs;h=ac790a57e9c6c559fcd1ac6c8745fd57644d8fe0;hb=f57295f9d9b6c07cdedfc7cb4f83878eebfb28b6;hp=48c906a33074b48c3475de41cd5171d98393fbe2;hpb=df3ab2ee2753e7f9ec02ddf1c8a51db77c50e35d;p=rust-lightning

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 48c906a3..ac790a57 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -1942,15 +1942,6 @@ macro_rules! handle_error {
 			},
 		}
 	} };
-	($self: ident, $internal: expr) => {
-		match $internal {
-			Ok(res) => Ok(res),
-			Err((chan, msg_handle_err)) => {
-				let counterparty_node_id = chan.get_counterparty_node_id();
-				handle_error!($self, Err(msg_handle_err), counterparty_node_id).map_err(|err| (chan, err))
-			},
-		}
-	};
 }
 
 macro_rules! update_maps_on_chan_removal {
@@ -2817,7 +2808,10 @@ where
 			debug_assert_ne!(peer.held_by_thread(), LockHeldState::HeldByThread);
 		}
 
-		log_debug!(self.logger, "Finishing closure of channel with {} HTLCs to fail", shutdown_res.dropped_outbound_htlcs.len());
+		let logger = WithContext::from(
+			&self.logger, Some(shutdown_res.counterparty_node_id), Some(shutdown_res.channel_id),
+		);
+		log_debug!(logger, "Finishing closure of channel with {} HTLCs to fail", shutdown_res.dropped_outbound_htlcs.len());
 		for htlc_source in shutdown_res.dropped_outbound_htlcs.drain(..) {
 			let (source, payment_hash, counterparty_node_id, channel_id) = htlc_source;
 			let reason = HTLCFailReason::from_failure_code(0x4000 | 8);