From: Valentine Wallace Date: Wed, 13 Dec 2023 19:09:16 +0000 (-0500) Subject: Fix logger usage during batched htlc processing of malforms. X-Git-Tag: v0.0.120~12^2~4 X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=5c880a05492b3266b838a0975532c425380b6ef3;p=rust-lightning Fix logger usage during batched htlc processing of malforms. Introduced due to a rebase error. --- diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs index f08096426..4ece6f046 100644 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@ -4411,10 +4411,10 @@ where } }, HTLCForwardInfo::FailMalformedHTLC { htlc_id, failure_code, sha256_of_onion } => { - log_trace!(self.logger, "Failing malformed HTLC back to channel with short id {} (backward HTLC ID {}) after delay", short_chan_id, htlc_id); - if let Err(e) = chan.queue_fail_malformed_htlc(htlc_id, failure_code, sha256_of_onion, &self.logger) { + log_trace!(logger, "Failing malformed HTLC back to channel with short id {} (backward HTLC ID {}) after delay", short_chan_id, htlc_id); + if let Err(e) = chan.queue_fail_malformed_htlc(htlc_id, failure_code, sha256_of_onion, &&logger) { if let ChannelError::Ignore(msg) = e { - log_trace!(self.logger, "Failed to fail HTLC with ID {} backwards to short_id {}: {}", htlc_id, short_chan_id, msg); + log_trace!(logger, "Failed to fail HTLC with ID {} backwards to short_id {}: {}", htlc_id, short_chan_id, msg); } else { panic!("Stated return value requirements in queue_fail_malformed_htlc() were not met"); }