Fix logger usage during batched htlc processing of malforms.
authorValentine Wallace <vwallace@protonmail.com>
Wed, 13 Dec 2023 19:09:16 +0000 (14:09 -0500)
committerValentine Wallace <vwallace@protonmail.com>
Wed, 10 Jan 2024 16:23:44 +0000 (11:23 -0500)
Introduced due to a rebase error.

lightning/src/ln/channelmanager.rs

index f08096426ff7c9bef04629064e02b27082c0c738..4ece6f046347773ff36155be86ab9d1c5a5bbcea 100644 (file)
@@ -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");
                                                                                }