From 2118feb090c279be7a1eac4f7104dd619a6f379e Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 15 Nov 2019 17:19:26 -0500 Subject: [PATCH] Fix build broken by silent merge conflicts --- src/ln/channelmanager.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs index a0e066371..fad5b30b3 100644 --- a/src/ln/channelmanager.rs +++ b/src/ln/channelmanager.rs @@ -1393,14 +1393,16 @@ impl ChannelManager { match handle_error!(self, err) { Ok(_) => unreachable!(), Err(e) => { - if let Some(msgs::ErrorAction::IgnoreError) = e.action { - } else { - log_error!(self, "Got bad keys: {}!", e.err); - let mut channel_state = self.channel_state.lock().unwrap(); - channel_state.pending_msg_events.push(events::MessageSendEvent::HandleError { - node_id: their_node_id, - action: e.action, - }); + match e.action { + msgs::ErrorAction::IgnoreError => {}, + _ => { + log_error!(self, "Got bad keys: {}!", e.err); + let mut channel_state = self.channel_state.lock().unwrap(); + channel_state.pending_msg_events.push(events::MessageSendEvent::HandleError { + node_id: their_node_id, + action: e.action, + }); + }, } continue; }, -- 2.39.5