f pre-flight checks to use new claimable_balance/HTLC storage format

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3835,27 +3835,25 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					valid_mpp = false;
 					break;
 				}
+				if expected_amt_msat.is_some() && expected_amt_msat != Some(htlc.total_msat) {
+					log_error!(self.logger, "Somehow ended up with an MPP payment with different total amounts - this should not be reachable!");
+					debug_assert!(false);
+					valid_mpp = false;
+					break;
+				}
+				expected_amt_msat = Some(htlc.total_msat);
 				match &htlc.onion_payload {
 					OnionPayload::Spontaneous(_) => {
 						// We don't currently support MPP for spontaneous payments, so just check
 						// that there's one payment here and move on.
-						expected_amt_msat = Some(htlc.value);
 						if sources.len() != 1 {
 							log_error!(self.logger, "Somehow ended up with an MPP spontaneous payment - this should not be reachable!");
 							debug_assert!(false);
 							valid_mpp = false;
 							break;
 						}
 					},
-					OnionPayload::Invoice(hop_data) => {
-						if expected_amt_msat.is_some() && expected_amt_msat != Some(hop_data.total_msat) {
-							log_error!(self.logger, "Somehow ended up with an MPP payment with different total amounts - this should not be reachable!");
-							debug_assert!(false);
-							valid_mpp = false;
-							break;
-						}
-						expected_amt_msat = Some(hop_data.total_msat);
-					},
+					OnionPayload::Invoice {.. } => {},
 				}
 
 				claimable_amt_msat += htlc.value;