X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Fmsg_targets%2Futils.rs;h=6325f3bf10d07bab3469b018ab106c7c732ec1d7;hb=f9983de4856f5be0ea672119bfaf1d28e3916201;hp=82fa739fbcfbd4febfb33af89b6bbcb31717d559;hpb=4395b92cc8bfe0cc803e70bba11f4db58d5d0dbf;p=rust-lightning

diff --git a/fuzz/src/msg_targets/utils.rs b/fuzz/src/msg_targets/utils.rs
index 82fa739f..6325f3bf 100644
--- a/fuzz/src/msg_targets/utils.rs
+++ b/fuzz/src/msg_targets/utils.rs
@@ -13,13 +13,9 @@ use lightning::util::ser::Writer;
 pub struct VecWriter(pub Vec<u8>);
 impl Writer for VecWriter {
 	fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
-		assert!(self.0.capacity() >= self.0.len() + buf.len());
 		self.0.extend_from_slice(buf);
 		Ok(())
 	}
-	fn size_hint(&mut self, size: usize) {
-		self.0.reserve_exact(size);
-	}
 }
 
 // We attempt to test the strictest behavior we can for a given message, however, some messages
@@ -43,6 +39,7 @@ macro_rules! test_msg {
 				msg.write(&mut w).unwrap();
 
 				assert_eq!(w.0.len(), p);
+				assert_eq!(msg.serialized_length(), p);
 				assert_eq!(&r.into_inner()[..p], &w.0[..p]);
 			}
 		}
@@ -60,6 +57,7 @@ macro_rules! test_msg_simple {
 			if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
 				let mut w = VecWriter(Vec::new());
 				msg.write(&mut w).unwrap();
+				assert_eq!(msg.serialized_length(), w.0.len());
 
 				let msg = <$MsgType as Readable>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
 				let mut w_two = VecWriter(Vec::new());
@@ -82,6 +80,7 @@ macro_rules! test_msg_exact {
 				let mut w = VecWriter(Vec::new());
 				msg.write(&mut w).unwrap();
 				assert_eq!(&r.into_inner()[..], &w.0[..]);
+				assert_eq!(msg.serialized_length(), w.0.len());
 			}
 		}
 	}
@@ -99,6 +98,7 @@ macro_rules! test_msg_hole {
 				let mut w = VecWriter(Vec::new());
 				msg.write(&mut w).unwrap();
 				let p = w.0.len() as usize;
+				assert_eq!(msg.serialized_length(), p);
 
 				assert_eq!(w.0.len(), p);
 				assert_eq!(&r.get_ref()[..$hole], &w.0[..$hole]);