`rustfmt`: `fuzz/src/chanmon_deser.rs`

[rust-lightning] / fuzz / src / chanmon_deser.rs

diff --git a/fuzz/src/chanmon_deser.rs b/fuzz/src/chanmon_deser.rs
index 3f4ff5ad0a131789cf12fc00ef0c1f560d067f73..b9c0121377245cb73b62a23ca24cea4f97c729d8 100644 (file)
--- a/fuzz/src/chanmon_deser.rs
+++ b/fuzz/src/chanmon_deser.rs
@@ -3,11 +3,12 @@
 
 use bitcoin::hash_types::BlockHash;
 
-use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
-use lightning::ln::channelmonitor;
-use lightning::util::ser::{Readable, Writer};
+use lightning::chain::channelmonitor;
+use lightning::util::ser::{ReadableArgs, Writeable, Writer};
+use lightning::util::test_channel_signer::TestChannelSigner;
+use lightning::util::test_utils::OnlyReadsKeysInterface;
 
-use utils::test_logger;
+use crate::utils::test_logger;
 
 use std::io::Cursor;
 
@@ -17,17 +18,23 @@ 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, channelmonitor::ChannelMonitor<EnforcingChannelKeys>)>::read(&mut Cursor::new(data)) {
+       if let Ok((latest_block_hash, monitor)) =
+               <(BlockHash, channelmonitor::ChannelMonitor<TestChannelSigner>)>::read(
+                       &mut Cursor::new(data),
+                       (&OnlyReadsKeysInterface {}, &OnlyReadsKeysInterface {}),
+               ) {
                let mut w = VecWriter(Vec::new());
-               monitor.write_for_disk(&mut w).unwrap();
-               let deserialized_copy = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingChannelKeys>)>::read(&mut Cursor::new(&w.0)).unwrap();
+               monitor.write(&mut w).unwrap();
+               let deserialized_copy =
+                       <(BlockHash, channelmonitor::ChannelMonitor<TestChannelSigner>)>::read(
+                               &mut Cursor::new(&w.0),
+                               (&OnlyReadsKeysInterface {}, &OnlyReadsKeysInterface {}),
+                       )
+                       .unwrap();
                assert!(latest_block_hash == deserialized_copy.0);
                assert!(monitor == deserialized_copy.1);
        }
@@ -39,5 +46,5 @@ pub fn chanmon_deser_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 
 #[no_mangle]
 pub extern "C" fn chanmon_deser_run(data: *const u8, datalen: usize) {
-       do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, test_logger::DevNull{});
+       do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, test_logger::DevNull {});
 }