From f76e14c4256550f39421ec0ed14bbe796d072f13 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 17 Jun 2021 15:31:05 +0000
Subject: [PATCH] Somewhat simplify message handling error mapping in
 peer_handler

---
 lightning/src/ln/peer_handler.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index c5128e25..ac6cef29 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -966,27 +966,21 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref> PeerManager<D
 				self.message_handler.chan_handler.handle_announcement_signatures(&peer.their_node_id.unwrap(), &msg);
 			},
 			wire::Message::ChannelAnnouncement(msg) => {
-				if match self.message_handler.route_handler.handle_channel_announcement(&msg) {
-					Ok(v) => v,
-					Err(e) => { return Err(e.into()); },
-				} {
+				if self.message_handler.route_handler.handle_channel_announcement(&msg)
+						.map_err(|e| -> MessageHandlingError { e.into() })? {
 					should_forward = Some(wire::Message::ChannelAnnouncement(msg));
 				}
 			},
 			wire::Message::NodeAnnouncement(msg) => {
-				if match self.message_handler.route_handler.handle_node_announcement(&msg) {
-					Ok(v) => v,
-					Err(e) => { return Err(e.into()); },
-				} {
+				if self.message_handler.route_handler.handle_node_announcement(&msg)
+						.map_err(|e| -> MessageHandlingError { e.into() })? {
 					should_forward = Some(wire::Message::NodeAnnouncement(msg));
 				}
 			},
 			wire::Message::ChannelUpdate(msg) => {
 				self.message_handler.chan_handler.handle_channel_update(&peer.their_node_id.unwrap(), &msg);
-				if match self.message_handler.route_handler.handle_channel_update(&msg) {
-					Ok(v) => v,
-					Err(e) => { return Err(e.into()); },
-				} {
+				if self.message_handler.route_handler.handle_channel_update(&msg)
+						.map_err(|e| -> MessageHandlingError { e.into() })? {
 					should_forward = Some(wire::Message::ChannelUpdate(msg));
 				}
 			},
-- 
2.30.2