Add fuzz targets for Writeable messages/migrate fuzz test

Author: yuntai

fuzz/Cargo.toml

@@ -54,11 +54,11 @@ path = "fuzz_targets/chanmon_deser_target.rs"
 # message fuzz targets
 [[bin]]
 name = "msg_ping_target"
-path = "fuzz_targets/msg_ping_target.rs"
+path = "fuzz_targets/msg_targets/msg_ping_target.rs"
 
 [[bin]]
 name = "msg_pong_target"
-path = "fuzz_targets/msg_pong_target.rs"
+path = "fuzz_targets/msg_targets/msg_pong_target.rs"
 
 [[bin]]
 name = "msg_error_message_target"

fuzz/fuzz_targets/msg_targets/gen_target.sh

@@ -31,3 +31,6 @@ GEN_TEST NodeAnnouncement test_msg_exact ""
 GEN_TEST UpdateAddHTLC test_msg_hole ", 85, 33"
 GEN_TEST ErrorMessage test_msg_hole ", 32, 2"
 GEN_TEST OnionHopData test_msg_hole ", 1+8+8+4, 12"
+
+GEN_TEST Ping test_msg_simple ""
+GEN_TEST Pong test_msg_simple ""

fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_init_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_ping_target.rs renamed to fuzz/fuzz_targets/msg_targets/msg_ping_target.rs

@@ -3,16 +3,15 @@
 
 extern crate lightning;
 
+use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable, Ping};
+mod utils;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	if let Ok(msg) = Ping::decode(data) {
-		let _ = msg.encode();
-	}
+	test_msg_simple!(msgs::Ping, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_pong_target.rs renamed to fuzz/fuzz_targets/msg_targets/msg_pong_target.rs

@@ -3,16 +3,15 @@
 
 extern crate lightning;
 
+use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable, Pong};
+mod utils;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	if let Ok(msg) = Pong::decode(data) {
-		let _ = msg.encode();
-	}
+	test_msg_simple!(msgs::Pong, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_target_template.txt

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs

@@ -6,8 +6,6 @@ extern crate lightning;
 use lightning::ln::msgs;
 use lightning::util::reset_rng_state;
 
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
 mod utils;
 
 #[inline]

fuzz/fuzz_targets/msg_targets/utils.rs

@@ -4,9 +4,29 @@
 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();
 			}
 		}
 	}
@@ -16,9 +36,14 @@ macro_rules! test_msg {
 macro_rules! test_msg_exact {
 	($MsgType: path, $data: ident) => {
 		{
-			if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
-				let enc = msg.encode();
-				assert_eq!(&$data[..], &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 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[..]);
 			}
 		}
 	}
@@ -28,10 +53,17 @@ macro_rules! test_msg_exact {
 macro_rules! test_msg_hole {
 	($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {
 		{
-			if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
-				let enc = msg.encode();
-				assert_eq!(&$data[..$hole], &enc[..$hole]);
-				assert_eq!(&$data[$hole + $hole_len..enc.len()], &enc[$hole + $hole_len..]);
+			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..]);
 			}
 		}
 	}