f - explicit encodings

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -19,7 +19,7 @@ use offers::merkle::{SignatureTlvStream, self};
 use offers::offer::{Amount, OfferContents, OfferTlvStream};
 use offers::parse::{ParseError, SemanticError};
 use offers::payer::{PayerContents, PayerTlvStream};
-use util::ser::{Readable, WithoutLength, Writeable, Writer};
+use util::ser::{HighZeroBytesDroppedBigSize, Readable, WithoutLength, Writeable, Writer};
 
 use prelude::*;
 
@@ -123,11 +123,11 @@ impl TryFrom<Vec<u8>> for InvoiceRequest {
 
 tlv_stream!(InvoiceRequestTlvStream, InvoiceRequestTlvStreamRef, {
 	(80, chain: ChainHash),
-	(82, amount: u64),
+	(82, amount: (u64, HighZeroBytesDroppedBigSize)),
 	(84, features: OfferFeatures),
-	(86, quantity: u64),
+	(86, quantity: (u64, HighZeroBytesDroppedBigSize)),
 	(88, payer_id: PublicKey),
-	(89, payer_note: String),
+	(89, payer_note: (String, WithoutLength)),
 });
 
 type ParsedInvoiceRequest = (Vec<u8>, FullInvoiceRequestTlvStream);

lightning/src/offers/payer.rs

@@ -9,6 +9,8 @@
 
 //! Data structures and encoding for `invoice_request_payer_info` records.
 
+use util::ser::WithoutLength;
+
 use prelude::*;
 
 /// An unpredictable sequence of bytes typically containing information needed to derive
@@ -19,5 +21,5 @@ use prelude::*;
 pub(crate) struct PayerContents(pub Option<Vec<u8>>);
 
 tlv_stream!(PayerTlvStream, PayerTlvStreamRef, {
-	(0, metadata: Vec<u8>),
+	(0, metadata: (Vec<u8>, WithoutLength)),
 });