Consider channel_ids in short_to_chan_info as unguaranteed

As the `short_to_chan_info` map has been removed from the
`channel_state`, there is no longer any consistency guarantees between
the `by_id` and `short_to_chan_info` maps. This commit ensures that we
don't force unwrap channels where the channel_id has been queried from
the `short_to_chan_info` map.

Author: ViktorTigerstrom

lightning/src/ln/channelmanager.rs

@@ -2304,7 +2304,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 						Some((_cp_id, chan_id)) => Some(chan_id.clone()),
 					};
 					let chan_update_opt = if let Some(forwarding_id) = forwarding_id_opt {
-						let chan = channel_state.by_id.get_mut(&forwarding_id).unwrap();
+						let chan = match channel_state.by_id.get_mut(&forwarding_id){
+							None => {
+								// Channel was removed. The short_to_chan_info and by_id maps have
+								// no consistency guarantees.
+								break Some(("Don't have available channel for forwarding as requested.", 0x4000 | 10, None));
+							},
+							Some(chan) => chan
+						};
 						if !chan.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 							// Note that the behavior here should be identical to the above block - we
 							// should NOT reveal the existence or non-existence of a private channel if
@@ -2561,7 +2568,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 					},
 					None => { insert_outbound_payment!(); },
 				}
-			} else { unreachable!(); }
+			} else {
+				return Err(APIError::ChannelUnavailable{err: "No channel available with first hop!".to_owned()});
+			}
 			return Ok(());
 		};
 
@@ -3068,9 +3077,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 				let mut channel_state_lock = self.channel_state.lock().unwrap();
 				let channel_state = &mut *channel_state_lock;
 				if short_chan_id != 0 {
-					let forward_chan_id = match self.short_to_chan_info.read().unwrap().get(&short_chan_id) {
-						Some((_cp_id, chan_id)) => chan_id.clone(),
-						None => {
+					macro_rules! fail_pending_forwards {
+						() => {
 							for forward_info in pending_forwards.drain(..) {
 								match forward_info {
 									HTLCForwardInfo::AddHTLC { prev_short_channel_id, prev_htlc_id, forward_info: PendingHTLCInfo {
@@ -3157,6 +3165,12 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 									}
 								}
 							}
+						}
+					}
+					let forward_chan_id = match self.short_to_chan_info.read().unwrap().get(&short_chan_id) {
+						Some((_cp_id, chan_id)) => chan_id.clone(),
+						None => {
+							fail_pending_forwards!();
 							continue;
 						}
 					};
@@ -3286,7 +3300,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 							});
 						}
 					} else {
-						unreachable!();
+						fail_pending_forwards!();
+						continue;
 					}
 				} else {
 					for forward_info in pending_forwards.drain(..) {
@@ -4204,7 +4219,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 					return ClaimFundsFromHop::MonitorUpdateFail(counterparty_node_id, res, None);
 				},
 			}
-		} else { unreachable!(); }
+		} else { return ClaimFundsFromHop::PrevHopForceClosed }
 	}
 
 	fn finalize_claims(&self, mut sources: Vec<HTLCSource>) {
@@ -5124,7 +5139,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 					try_chan_entry!(self, chan.get_mut().channel_update(&msg), chan);
 				}
 			},
-			hash_map::Entry::Vacant(_) => unreachable!()
+			hash_map::Entry::Vacant(_) => return Ok(NotifyOption::SkipPersist)
 		}
 		Ok(NotifyOption::DoPersist)
 	}