fixup: Determine if we have lost data

Author: adi2011

lightning/src/ln/channelmanager.rs

@@ -9105,53 +9105,51 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		let per_peer_state = self.per_peer_state.read().unwrap();
 
 		let mut cursor = io::Cursor::new(decrypted);
-		match <PeerStorageMonitorHolderList as Readable>::read(&mut cursor) {
-			Ok(mon_list) => {
-				for mon_holder in mon_list.monitors.iter() {
-					let peer_state_mutex =
-						match per_peer_state.get(&mon_holder.counterparty_node_id) {
-							Some(mutex) => mutex,
-							None => {
-								log_debug!(
-									logger,
-									"Not able to find peer_state for the counterparty {}, channelId {}",
-									log_pubkey!(mon_holder.counterparty_node_id),
-									mon_holder.channel_id
-								);
-								continue;
-							},
-						};
+		let mon_list = <PeerStorageMonitorHolderList as Readable>::read(&mut cursor).unwrap_or_else(|e| {
+			// This should NEVER happen.
+			log_debug!(self.logger, "Unable to unpack the retrieved peer storage {:?}", e);
+			PeerStorageMonitorHolderList { monitors: Vec::new() }
+		});
 
-					let peer_state_lock = peer_state_mutex.lock().unwrap();
-					let peer_state = &*peer_state_lock;
+		for mon_holder in mon_list.monitors.iter() {
+			let peer_state_mutex =
+				match per_peer_state.get(&mon_holder.counterparty_node_id) {
+					Some(mutex) => mutex,
+					None => {
+						log_debug!(
+							logger,
+							"Not able to find peer_state for the counterparty {}, channelId {}",
+							log_pubkey!(mon_holder.counterparty_node_id),
+							mon_holder.channel_id
+						);
+						continue;
+					},
+				};
 
-					match peer_state.channel_by_id.get(&mon_holder.channel_id) {
-						Some(chan) => {
-							if let Some(funded_chan) = chan.as_funded() {
-								if funded_chan
-									.get_revoked_counterparty_commitment_transaction_number()
-									> mon_holder.min_seen_secret
-								{
-									panic!(
-										"Lost channel state for channel {}.
-										Received peer storage with a more recent state than what our node had.
-										Use the FundRecoverer to initiate a force close and sweep the funds.",
-										&mon_holder.channel_id
-									);
-								}
-							}
-						},
-						None => {
-							// TODO: Figure out if this channel is so old that we have forgotten about it.
-							panic!("Lost a channel {}", &mon_holder.channel_id);
-						},
-					}
-				}
-			},
+			let peer_state_lock = peer_state_mutex.lock().unwrap();
+			let peer_state = &*peer_state_lock;
 
-			Err(e) => {
-				panic!("Wrong serialisation of PeerStorageMonitorHolderList: {}", e);
-			},
+			match peer_state.channel_by_id.get(&mon_holder.channel_id) {
+				Some(chan) => {
+					if let Some(funded_chan) = chan.as_funded() {
+						if funded_chan
+							.get_revoked_counterparty_commitment_transaction_number()
+							> mon_holder.min_seen_secret
+						{
+							panic!(
+								"Lost channel state for channel {}.
+								Received peer storage with a more recent state than what our node had.
+								Use the FundRecoverer to initiate a force close and sweep the funds.",
+								&mon_holder.channel_id
+							);
+						}
+					}
+				},
+				None => {
+					// TODO: Figure out if this channel is so old that we have forgotten about it.
+					panic!("Lost a channel {}", &mon_holder.channel_id);
+				},
+			}
 		}
 		Ok(())
 	}