X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Fmsg_targets%2Futils.rs;h=c1bcd8f361887003d4e2823d2e5445fc4ce16496;hb=28a612f9f3c6a855c914aaf8cb10ef14772c7b90;hp=27de871dcb647afc98e4dece02d28aa889d1fb7c;hpb=4c44b787f1ffcab8ceec47a4973915ec24ba590e;p=rust-lightning

diff --git a/fuzz/fuzz_targets/msg_targets/utils.rs b/fuzz/fuzz_targets/msg_targets/utils.rs
index 27de871d..c1bcd8f3 100644
--- a/fuzz/fuzz_targets/msg_targets/utils.rs
+++ b/fuzz/fuzz_targets/msg_targets/utils.rs
@@ -4,9 +4,66 @@
 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::{Writer, Reader, Writeable, Readable};
+			let mut r = Reader::new(::std::io::Cursor::new($data));
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				let p = r.get_ref().position() as usize;
+				let mut w = Writer::new(::std::io::Cursor::new(vec![]));
+				msg.write(&mut w).unwrap();
+
+				let buf = w.into_inner().into_inner();
+				assert_eq!(buf.len(), p);
+				assert_eq!(&r.into_inner().into_inner()[..p], &buf[..p]);
+			}
+		}
+	}
+}
+
+#[macro_export]
+macro_rules! test_msg_simple {
+	($MsgType: path, $data: ident) => {
+		{
+			use lightning::util::ser::{Writer, Reader, Writeable, Readable};
+			let mut r = Reader::new(::std::io::Cursor::new($data));
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				msg.write(&mut Writer::new(::std::io::Cursor::new(vec![]))).unwrap();
+			}
+		}
+	}
+}
+
+#[macro_export]
+macro_rules! test_msg_exact {
+	($MsgType: path, $data: ident) => {
+		{
+			use lightning::util::ser::{Writer, Reader, Writeable, Readable};
+			let mut r = Reader::new(::std::io::Cursor::new($data));
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				let mut w = Writer::new(::std::io::Cursor::new(vec![]));
+				msg.write(&mut w).unwrap();
+
+				let buf = w.into_inner().into_inner();
+				assert_eq!(&r.into_inner().into_inner()[..], &buf[..]);
+			}
+		}
+	}
+}
+
+#[macro_export]
+macro_rules! test_msg_hole {
+	($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {
+		{
+			use lightning::util::ser::{Writer, Reader, Writeable, Readable};
+			let mut r = Reader::new(::std::io::Cursor::new($data));
+			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+				let mut w = Writer::new(::std::io::Cursor::new(vec![]));
+				msg.write(&mut w).unwrap();
+				let p = w.get_ref().position() as usize;
+
+				let buf = w.into_inner().into_inner();
+				assert_eq!(buf.len(),p);
+				assert_eq!(&r.get_ref().get_ref()[..$hole], &buf[..$hole]);
+				assert_eq!(&r.get_ref().get_ref()[$hole+$hole_len..p], &buf[$hole+$hole_len..]);
 			}
 		}
 	}