f - use more compact representation

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -1150,10 +1150,10 @@ impl Writeable for InvoiceRequestFields {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 		write_tlv_fields!(writer, {
 			(0, self.payer_id, required),
-			(2, self.amount_msats, option),
+			(2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 			(4, WithoutLength(&self.features), required),
-			(6, self.quantity, option),
-			(8, self.payer_note_truncated, option),
+			(6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
+			(8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 		});
 		Ok(())
 	}
@@ -1163,15 +1163,16 @@ impl Readable for InvoiceRequestFields {
 	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 		_init_and_read_len_prefixed_tlv_fields!(reader, {
 			(0, payer_id, required),
-			(2, amount_msats, option),
+			(2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 			(4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
-			(6, quantity, option),
-			(8, payer_note_truncated, option),
+			(6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
+			(8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 		});
 		let features = features.unwrap_or(InvoiceRequestFeatures::empty());
 
 		Ok(InvoiceRequestFields {
-			payer_id: payer_id.0.unwrap(), amount_msats, features, quantity, payer_note_truncated,
+			payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
+			payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 		})
 	}
 }