Util-func channel removal (fixing a bug in HTLC failure updates)

diff --git a/src/ln/router.rs b/src/ln/router.rs
index 6bc319d59b8145de6162f47c7c78d746fd318a12..e91e0c2acd8cb49fa514df0303ffd6b58f82a3ae 100644 (file)
--- a/src/ln/router.rs
+++ b/src/ln/router.rs
@@ -306,12 +306,7 @@ impl RoutingMessageHandler for Router {
                        &msgs::HTLCFailChannelUpdate::ChannelClosed { ref short_channel_id } => {
                                let mut network = self.network_map.write().unwrap();
                                if let Some(chan) = network.channels.remove(short_channel_id) {
-                                       network.nodes.get_mut(&chan.one_to_two.src_node_id).unwrap().channels.retain(|chan_id| {
-                                               chan_id != NetworkMap::get_short_id(chan_id)
-                                       });
-                                       network.nodes.get_mut(&chan.two_to_one.src_node_id).unwrap().channels.retain(|chan_id| {
-                                               chan_id != NetworkMap::get_short_id(chan_id)
-                                       });
+                                       Self::remove_channel_in_nodes(&mut network.nodes, &chan, *short_channel_id);
                                }
                        },
                }
@@ -462,6 +457,25 @@ impl Router {
                unimplemented!();
        }
 
+       fn remove_channel_in_nodes(nodes: &mut HashMap<PublicKey, NodeInfo>, chan: &ChannelInfo, short_channel_id: u64) {
+               macro_rules! remove_from_node {
+                       ($node_id: expr) => {
+                               if let Entry::Occupied(mut entry) = nodes.entry($node_id) {
+                                       entry.get_mut().channels.retain(|chan_id| {
+                                               short_channel_id != *NetworkMap::get_short_id(chan_id)
+                                       });
+                                       if entry.get().channels.is_empty() {
+                                               entry.remove_entry();
+                                       }
+                               } else {
+                                       panic!("Had channel that pointed to unknown node (ie inconsistent network map)!");
+                               }
+                       }
+               }
+               remove_from_node!(chan.one_to_two.src_node_id);
+               remove_from_node!(chan.two_to_one.src_node_id);
+       }
+
        /// Gets a route from us to the given target node.
        /// Extra routing hops between known nodes and the target will be used if they are included in
        /// last_hops.