f drop read expr

Author: TheBlueMatt

lightning/src/util/ser_macros.rs

@@ -1859,18 +1859,8 @@ mod tests {
 		new_field: (u8, u8),
 	}
 	impl_writeable_tlv_based!(ExpandedField, {
-		(0, old_field, (legacy, u8, {
-			// Sadly the type-checker needs some help
-			let _: &(u8, u8) = &new_field;
-			// If new_field.0 is 0, we assume we hit the default_value case below and overwrite the
-			// value with the old data.
-			if new_field == (0, 0) {
-				if let Some(old_field) = old_field {
-					new_field.0 = old_field;
-				}
-			}
-		}, |us: &ExpandedField| Some(us.new_field.0))),
-		(1, new_field, (default_value, (0, 0))),
+		(0, old_field, (legacy, u8, |us: &ExpandedField| Some(us.new_field.0))),
+		(1, new_field, (default_value, (old_field.ok_or(DecodeError::InvalidValue)?, 0))),
 	});
 
 	#[test]