X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Fchanmon_deser.rs;h=8c8f4aedf7a438d2a6ecf7b0f9a2eb95d9c6877d;hb=2cb34678ccd51eb6a86f44a9a8359c1181eb0bae;hp=0f8fc9f6074e0ffefca9390e56f248fb1deec91b;hpb=51a5a1a50f59ecdddece6e0baeb0ac0ec48d168a;p=rust-lightning

diff --git a/fuzz/src/chanmon_deser.rs b/fuzz/src/chanmon_deser.rs
index 0f8fc9f6..8c8f4aed 100644
--- a/fuzz/src/chanmon_deser.rs
+++ b/fuzz/src/chanmon_deser.rs
@@ -3,11 +3,12 @@
 
 use bitcoin::hash_types::BlockHash;
 
-use lightning::chain::chainmonitor;
-use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
-use lightning::util::ser::{Readable, Writer};
+use lightning::chain::channelmonitor;
+use lightning::util::enforcing_trait_impls::EnforcingSigner;
+use lightning::util::ser::{ReadableArgs, Writer, Writeable};
+use lightning::util::test_utils::OnlyReadsKeysInterface;
 
-use utils::test_logger;
+use crate::utils::test_logger;
 
 use std::io::Cursor;
 
@@ -17,17 +18,14 @@ impl Writer for VecWriter {
 		self.0.extend_from_slice(buf);
 		Ok(())
 	}
-	fn size_hint(&mut self, size: usize) {
-		self.0.reserve_exact(size);
-	}
 }
 
 #[inline]
 pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	if let Ok((latest_block_hash, monitor)) = <(BlockHash, chainmonitor::ChannelMonitor<EnforcingChannelKeys>)>::read(&mut Cursor::new(data)) {
+	if let Ok((latest_block_hash, monitor)) = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::read(&mut Cursor::new(data), &OnlyReadsKeysInterface {}) {
 		let mut w = VecWriter(Vec::new());
-		monitor.write_for_disk(&mut w).unwrap();
-		let deserialized_copy = <(BlockHash, chainmonitor::ChannelMonitor<EnforcingChannelKeys>)>::read(&mut Cursor::new(&w.0)).unwrap();
+		monitor.write(&mut w).unwrap();
+		let deserialized_copy = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::read(&mut Cursor::new(&w.0), &OnlyReadsKeysInterface {}).unwrap();
 		assert!(latest_block_hash == deserialized_copy.0);
 		assert!(monitor == deserialized_copy.1);
 	}