X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Fchanmon_deser_target.rs;h=9ddf52c662ec7712acccfb0613100176eb9108ce;hb=09c7f2f641d2496c2a6280b032f62b6249298a0f;hp=adf4a3a6ac887195857d92500e90f12c70f8ede6;hpb=4c44b787f1ffcab8ceec47a4973915ec24ba590e;p=rust-lightning

diff --git a/fuzz/fuzz_targets/chanmon_deser_target.rs b/fuzz/fuzz_targets/chanmon_deser_target.rs
index adf4a3a6..9ddf52c6 100644
--- a/fuzz/fuzz_targets/chanmon_deser_target.rs
+++ b/fuzz/fuzz_targets/chanmon_deser_target.rs
@@ -1,26 +1,53 @@
 // 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 bitcoin;
 extern crate lightning;
 
+use bitcoin::util::hash::Sha256dHash;
+
 use lightning::ln::channelmonitor;
 use lightning::util::reset_rng_state;
+use lightning::util::ser::{ReadableArgs, Writer};
+
+mod utils;
+use utils::test_logger;
+
+use std::io::Cursor;
+use std::sync::Arc;
+
+struct VecWriter(Vec<u8>);
+impl Writer for VecWriter {
+	fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
+		self.0.extend_from_slice(buf);
+		Ok(())
+	}
+	fn size_hint(&mut self, size: usize) {
+		self.0.reserve_exact(size);
+	}
+}
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	if let Some(monitor) = channelmonitor::ChannelMonitor::deserialize(data) {
-		assert!(channelmonitor::ChannelMonitor::deserialize(&monitor.serialize_for_disk()[..]).unwrap() == monitor);
-		monitor.serialize_for_watchtower();
+	let logger = Arc::new(test_logger::TestLogger{});
+	if let Ok((latest_block_hash, monitor)) = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(data), logger.clone()) {
+		let mut w = VecWriter(Vec::new());
+		monitor.write_for_disk(&mut w).unwrap();
+		let deserialized_copy = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(&w.0), logger.clone()).unwrap();
+		assert!(latest_block_hash == deserialized_copy.0);
+		assert!(monitor == deserialized_copy.1);
+		w.0.clear();
+		monitor.write_for_watchtower(&mut w).unwrap();
 	}
 }
 
 #[cfg(feature = "afl")]
-extern crate afl;
+#[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
 fn main() {
-	afl::read_stdio_bytes(|data| {
-		do_test(&data);
+	fuzz!(|data| {
+		do_test(data);
 	});
 }