f use scids from removed node

Author: dunxen

lightning/src/routing/gossip.rs

@@ -1529,19 +1529,12 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 		let mut nodes = self.nodes.write().unwrap();
 		let mut channels = self.channels.write().unwrap();
 
-		let mut scids_to_remove = Vec::new();
-		for (scid, info) in channels.iter_mut() {
-			if info.node_one == node_id || info.node_two == node_id {
-				scids_to_remove.push(*scid);
-			}
-		}
-		nodes.remove(&node_id);
-
-		if !scids_to_remove.is_empty() {
-			// TODO: Use BTreeMap::retain when our MSRV is >= 1.53.
-			for scid in scids_to_remove {
-				let info = channels.remove(&scid).expect("We just accessed this scid, it should be present");
-				Self::remove_channel_in_nodes(&mut nodes, &info, scid);
+		if let Some(node) = nodes.remove(&node_id) {
+			for scid in node.channels.iter() {
+				// TODO: Use BTreeMap::retain when our MSRV is >= 1.53.
+				if let Some(info) = channels.remove(scid) {
+					Self::remove_channel_in_nodes(&mut nodes, &info, *scid);
+				}
 			}
 		}
 	}