f - fix raw byte encoding bug

Author: jkczyz

lightning/src/offers/offer.rs

@@ -79,7 +79,7 @@ use io;
 use ln::features::OfferFeatures;
 use offers::parse::{Bech32Encode, ParseError, SemanticError};
 use onion_message::BlindedPath;
-use util::ser::{Readable, Writeable, Writer};
+use util::ser::{Readable, WithoutLength, Writeable, Writer};
 
 use prelude::*;
 
@@ -394,7 +394,7 @@ impl OfferContents {
 
 impl Writeable for Offer {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
-		self.bytes.write(writer)
+		WithoutLength(&self.bytes).write(writer)
 	}
 }
 
@@ -558,11 +558,12 @@ impl core::fmt::Display for Offer {
 
 #[cfg(test)]
 mod tests {
-	use super::{Amount, OfferBuilder};
+	use super::{Amount, Offer, OfferBuilder};
 
 	use bitcoin::blockdata::constants::ChainHash;
 	use bitcoin::network::constants::Network;
 	use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
+	use core::convert::TryFrom;
 	use core::num::NonZeroU64;
 	use core::time::Duration;
 	use ln::features::OfferFeatures;
@@ -584,7 +585,7 @@ mod tests {
 		let offer = OfferBuilder::new("foo".into(), pubkey(42)).build().unwrap();
 		let tlv_stream = offer.as_tlv_stream();
 		let mut buffer = Vec::new();
-		offer.contents.write(&mut buffer).unwrap();
+		offer.write(&mut buffer).unwrap();
 
 		assert_eq!(offer.as_bytes(), buffer.as_slice());
 		assert_eq!(offer.chains(), vec![ChainHash::using_genesis_block(Network::Bitcoin)]);
@@ -613,6 +614,10 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, None);
 		assert_eq!(tlv_stream.quantity_max, None);
 		assert_eq!(tlv_stream.node_id, Some(&pubkey(42)));
+
+		if let Err(e) = Offer::try_from(buffer) {
+			panic!("error parsing offer: {:?}", e);
+		}
 	}
 
 	#[test]