f make total_msat required

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -16946,7 +16946,7 @@ impl Readable for (ClaimableHTLC, u64) {
 	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
 		_init_and_read_len_prefixed_tlv_fields!(reader, {
 			(0, prev_hop, required),
-			(1, total_msat, option),
+			(1, total_msat, required), // Added and always written in 0.0.107
 			(2, value_ser, required),
 			(3, sender_intended_value, option),
 			(4, payment_data_opt, option),
@@ -16962,20 +16962,9 @@ impl Readable for (ClaimableHTLC, u64) {
 				if payment_data.is_some() {
 					return Err(DecodeError::InvalidValue)
 				}
-				if total_msat.is_none() {
-					total_msat = Some(value);
-				}
 				OnionPayload::Spontaneous(p)
 			},
-			None => {
-				if total_msat.is_none() {
-					if payment_data.is_none() {
-						return Err(DecodeError::InvalidValue)
-					}
-					total_msat = Some(payment_data.as_ref().unwrap().total_msat);
-				}
-				OnionPayload::Invoice { _legacy_hop_data: payment_data }
-			},
+			None => OnionPayload::Invoice { _legacy_hop_data: payment_data },
 		};
 		Ok((ClaimableHTLC {
 			prev_hop: prev_hop.0.unwrap(),
@@ -16986,7 +16975,7 @@ impl Readable for (ClaimableHTLC, u64) {
 			onion_payload,
 			cltv_expiry: cltv_expiry.0.unwrap(),
 			counterparty_skimmed_fee_msat,
-		}, total_msat.unwrap()))
+		}, total_msat.0.expect("required field")))
 	}
 }