X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Fmsg_targets%2Futils.rs;h=a5257ba0f80c1fea24f399018103da37f572c763;hb=cd21a357d85eec93668f2526e300746a921cbad2;hp=4d355585da5d18d42dceaabdd8188953e038c3f8;hpb=d8474c9d3c422dddf6cf4b5a4f52157a0277203a;p=rust-lightning

diff --git a/fuzz/fuzz_targets/msg_targets/utils.rs b/fuzz/fuzz_targets/msg_targets/utils.rs
index 4d355585..a5257ba0 100644
--- a/fuzz/fuzz_targets/msg_targets/utils.rs
+++ b/fuzz/fuzz_targets/msg_targets/utils.rs
@@ -1,32 +1,81 @@
 #![macro_use]
 
+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);
+	}
+}
+
 #[macro_export]
 macro_rules! test_msg {
 	($MsgType: path, $data: ident) => {
 		{
-			if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
-				let enc = msg.encode();
-				assert_eq!(&$data[..enc.len()], &enc[..]);
+			use lightning::util::ser::{Writeable, Readable};
+			let mut r = ::std::io::Cursor::new($data);
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				let p = r.position() as usize;
+				let mut w = VecWriter(Vec::new());
+				msg.write(&mut w).unwrap();
+
+				assert_eq!(w.0.len(), p);
+				assert_eq!(&r.into_inner()[..p], &w.0[..p]);
 			}
 		}
 	}
 }
 
-#[allow(dead_code)]
-#[cfg(test)]
-pub fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-	let mut b = 0;
-	for (idx, c) in hex.as_bytes().iter().enumerate() {
-		b <<= 4;
-		match *c {
-			b'A'...b'F' => b |= c - b'A' + 10,
-			b'a'...b'f' => b |= c - b'a' + 10,
-			b'0'...b'9' => b |= c - b'0',
-			_ => panic!("Bad hex"),
+#[macro_export]
+macro_rules! test_msg_simple {
+	($MsgType: path, $data: ident) => {
+		{
+			use lightning::util::ser::{Writeable, Readable};
+			let mut r = ::std::io::Cursor::new($data);
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				let mut w = VecWriter(Vec::new());
+				msg.write(&mut w).unwrap();
+			}
 		}
-		if (idx & 1) == 1 {
-			out.push(b);
-			b = 0;
+	}
+}
+
+#[macro_export]
+macro_rules! test_msg_exact {
+	($MsgType: path, $data: ident) => {
+		{
+			use lightning::util::ser::{Writeable, Readable};
+			let mut r = ::std::io::Cursor::new($data);
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				let mut w = VecWriter(Vec::new());
+				msg.write(&mut w).unwrap();
+
+				assert_eq!(&r.into_inner()[..], &w.0[..]);
+			}
+		}
+	}
+}
+
+#[macro_export]
+macro_rules! test_msg_hole {
+	($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {
+		{
+			use lightning::util::ser::{Writeable, Readable};
+			let mut r = ::std::io::Cursor::new($data);
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				let mut w = VecWriter(Vec::new());
+				msg.write(&mut w).unwrap();
+				let p = w.0.len() as usize;
+
+				assert_eq!(w.0.len(), p);
+				assert_eq!(&r.get_ref()[..$hole], &w.0[..$hole]);
+				assert_eq!(&r.get_ref()[$hole+$hole_len..p], &w.0[$hole+$hole_len..]);
+			}
 		}
 	}
 }