Add fuzz testing for Writeable

Author: yuntai

fuzz/Cargo.toml

@@ -123,3 +123,7 @@ path = "fuzz_targets/msg_targets/msg_channel_reestablish_target.rs"
 [[bin]]
 name = "msg_error_message_target"
 path = "fuzz_targets/msg_targets/msg_error_message_target.rs"
+
+[[bin]]
+name = "msg_accept_channel_target_writeable"
+path = "fuzz_targets/msg_accept_channel_target_writeable.rs"

fuzz/fuzz_targets/msg_accept_channel_target_writeable.rs

@@ -0,0 +1,64 @@
+// This file is auto-generated by gen_target.sh based on msg_target_template.txt
+// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
+
+extern crate lightning;
+
+use lightning::ln::msgs;
+use lightning::util::reset_rng_state;
+
+use lightning::ln::msgs::{MsgEncodable, MsgDecodable, AcceptChannel};
+use lightning::util::ser::{Writeable, Readable, Writer, Reader};
+
+mod utils;
+
+#[inline]
+pub fn do_test(data: &[u8]) {
+	reset_rng_state();
+	let mut r = Reader::new(::std::io::Cursor::new(data));
+	if let Ok(msg) = AcceptChannel::read(&mut r) {
+		let p = r.get_ref().position() as usize;
+		if p > r.get_ref().get_ref().len() {
+			return
+		}
+		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()[..p], &buf[..p]);
+
+		let msg2 = AcceptChannel::decode(&buf[..]).unwrap();
+		let enc = msg2.encode();
+		assert_eq!(p, enc.len());
+		assert_eq!(&data[..p], &enc[..]);
+			
+	}
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+	afl::read_stdio_bytes(|data| {
+		do_test(&data);
+	});
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+	loop {
+		fuzz!(|data| {
+			do_test(data);
+		});
+	}
+}
+
+extern crate hex;
+#[cfg(test)]
+mod tests {
+	#[test]
+	fn duplicate_crash() {
+		super::do_test(&::hex::decode("00").unwrap());
+	}
+}

src/ln/msgs.rs

@@ -9,6 +9,7 @@ use std::fmt;
 use std::result::Result;
 
 use util::{byte_utils, internal_traits, events};
+use util::ser::{Readable, Reader, Writeable, Writer};
 
 pub trait MsgEncodable {
 	fn encode(&self) -> Vec<u8>;
@@ -1665,6 +1666,24 @@ impl MsgDecodable for ErrorMessage {
 	}
 }
 
+impl_writeable!(AcceptChannel, {
+	temporary_channel_id,
+	dust_limit_satoshis,
+	max_htlc_value_in_flight_msat,
+	channel_reserve_satoshis,
+	htlc_minimum_msat,
+	minimum_depth,
+	to_self_delay,
+	max_accepted_htlcs,
+	funding_pubkey,
+	revocation_basepoint,
+	payment_basepoint,
+	delayed_payment_basepoint,
+	htlc_basepoint,
+	first_per_commitment_point,
+	shutdown_scriptpubkey
+});
+
 #[cfg(test)]
 mod tests {
 	use hex;

src/util/mod.rs

@@ -21,4 +21,11 @@ pub(crate) mod test_utils;
 #[macro_use]
 pub(crate) mod macro_logger;
 
+#[cfg(feature = "fuzztarget")]
+#[macro_use]
+pub mod ser;
+#[cfg(not(feature = "fuzztarget"))]
+#[macro_use]
+pub(crate) mod ser;
+
 pub mod logger;