f - Use impl_writeable_tlv_stream

Author: jkczyz

lightning/src/offers/mod.rs

@@ -27,14 +27,13 @@ use prelude::*;
 /// the underlying types.
 #[derive(Debug)]
 struct OfferTlvStream {
-	_empty: (),
-	chains: Option<WithoutLength<Vec<BlockHash>>>,
+	chains: Vec<BlockHash>,
 	currency: Option<WithoutLength<String>>,
 	amount: Option<HighZeroBytesDroppedVarInt<u64>>,
 	description: Option<WithoutLength<String>>,
 	features: Option<OfferFeatures>,
 	absolute_expiry: Option<HighZeroBytesDroppedVarInt<u64>>,
-	paths: Option<WithoutLength<Vec<BlindedPath>>>,
+	paths: Vec<BlindedPath>,
 	issuer: Option<WithoutLength<String>>,
 	quantity_min: Option<HighZeroBytesDroppedVarInt<u64>>,
 	quantity_max: Option<HighZeroBytesDroppedVarInt<u64>>,
@@ -45,14 +44,14 @@ struct OfferTlvStream {
 	signature: Option<Signature>,
 }
 
-impl_writeable_msg!(OfferTlvStream, { _empty }, {
-	(2, chains, option),
+impl_writeable_tlv_stream!(OfferTlvStream, {
+	(2, chains, vec_type),
 	(6, currency, option),
 	(8, amount, option),
 	(10, description, option),
 	(12, features, option),
 	(14, absolute_expiry, option),
-	(16, paths, option),
+	(16, paths, vec_type),
 	(20, issuer, option),
 	(22, quantity_min, option),
 	(24, quantity_max, option),