AsyncPaymentsMessageHandler trait for OnionMessenger

[rust-lightning] / fuzz / src / msg_targets / utils.rs

diff --git a/fuzz/src/msg_targets/utils.rs b/fuzz/src/msg_targets/utils.rs
index 7e3bf52e4c7cef431206173dc64f436560182642..5fa474cbf02f291c9b66194133111c224228fcab 100644 (file)
--- a/fuzz/src/msg_targets/utils.rs
+++ b/fuzz/src/msg_targets/utils.rs
@@ -1,16 +1,21 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
 #![macro_use]
 
 use lightning::util::ser::Writer;
 pub struct VecWriter(pub Vec<u8>);
 impl Writer for VecWriter {
        fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
-               assert!(self.0.capacity() >= self.0.len() + buf.len());
                self.0.extend_from_slice(buf);
                Ok(())
        }
-       fn size_hint(&mut self, size: usize) {
-               self.0.reserve_exact(size);
-       }
 }
 
 // We attempt to test the strictest behavior we can for a given message, however, some messages
@@ -24,77 +29,73 @@ impl Writer for VecWriter {
 // entirely
 #[macro_export]
 macro_rules! test_msg {
-       ($MsgType: path, $data: ident) => {
-               {
-                       use lightning::util::ser::{Writeable, Readable};
-                       let mut r = ::std::io::Cursor::new($data);
-                       if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
-                               let p = r.position() as usize;
-                               let mut w = VecWriter(Vec::new());
-                               msg.write(&mut w).unwrap();
+       ($MsgType: path, $data: ident) => {{
+               use lightning::util::ser::{Readable, Writeable};
+               let mut r = ::std::io::Cursor::new($data);
+               if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
+                       let p = r.position() as usize;
+                       let mut w = VecWriter(Vec::new());
+                       msg.write(&mut w).unwrap();
 
-                               assert_eq!(w.0.len(), p);
-                               assert_eq!(&r.into_inner()[..p], &w.0[..p]);
-                       }
+                       assert_eq!(w.0.len(), p);
+                       assert_eq!(msg.serialized_length(), p);
+                       assert_eq!(&r.into_inner()[..p], &w.0[..p]);
                }
-       }
+       }};
 }
 
 // Tests a message that may lose data on roundtrip, but shoulnd't lose data compared to our
 // re-serialization.
 #[macro_export]
 macro_rules! test_msg_simple {
-       ($MsgType: path, $data: ident) => {
-               {
-                       use lightning::util::ser::{Writeable, Readable};
-                       let mut r = ::std::io::Cursor::new($data);
-                       if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
-                               let mut w = VecWriter(Vec::new());
-                               msg.write(&mut w).unwrap();
+       ($MsgType: path, $data: ident) => {{
+               use lightning::util::ser::{Readable, Writeable};
+               let mut r = ::std::io::Cursor::new($data);
+               if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
+                       let mut w = VecWriter(Vec::new());
+                       msg.write(&mut w).unwrap();
+                       assert_eq!(msg.serialized_length(), w.0.len());
 
-                               let msg = <$MsgType as Readable>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
-                               let mut w_two = VecWriter(Vec::new());
-                               msg.write(&mut w_two).unwrap();
-                               assert_eq!(&w.0[..], &w_two.0[..]);
-                       }
+                       let msg = <$MsgType as Readable>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
+                       let mut w_two = VecWriter(Vec::new());
+                       msg.write(&mut w_two).unwrap();
+                       assert_eq!(&w.0[..], &w_two.0[..]);
                }
-       }
+       }};
 }
 
 // Tests a message that must survive roundtrip exactly, and must exactly empty the read buffer and
 // split it back out on re-serialization.
 #[macro_export]
 macro_rules! test_msg_exact {
-       ($MsgType: path, $data: ident) => {
-               {
-                       use lightning::util::ser::{Writeable, Readable};
-                       let mut r = ::std::io::Cursor::new($data);
-                       if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
-                               let mut w = VecWriter(Vec::new());
-                               msg.write(&mut w).unwrap();
-                               assert_eq!(&r.into_inner()[..], &w.0[..]);
-                       }
+       ($MsgType: path, $data: ident) => {{
+               use lightning::util::ser::{Readable, Writeable};
+               let mut r = ::std::io::Cursor::new($data);
+               if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
+                       let mut w = VecWriter(Vec::new());
+                       msg.write(&mut w).unwrap();
+                       assert_eq!(&r.into_inner()[..], &w.0[..]);
+                       assert_eq!(msg.serialized_length(), w.0.len());
                }
-       }
+       }};
 }
 
 // Tests a message that must survive roundtrip exactly, modulo one "hole" which may be set to
 // any value on re-serialization.
 #[macro_export]
 macro_rules! test_msg_hole {
-       ($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {
-               {
-                       use lightning::util::ser::{Writeable, Readable};
-                       let mut r = ::std::io::Cursor::new($data);
-                       if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
-                               let mut w = VecWriter(Vec::new());
-                               msg.write(&mut w).unwrap();
-                               let p = w.0.len() as usize;
+       ($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {{
+               use lightning::util::ser::{Readable, Writeable};
+               let mut r = ::std::io::Cursor::new($data);
+               if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
+                       let mut w = VecWriter(Vec::new());
+                       msg.write(&mut w).unwrap();
+                       let p = w.0.len() as usize;
+                       assert_eq!(msg.serialized_length(), p);
 
-                               assert_eq!(w.0.len(), p);
-                               assert_eq!(&r.get_ref()[..$hole], &w.0[..$hole]);
-                               assert_eq!(&r.get_ref()[$hole+$hole_len..p], &w.0[$hole+$hole_len..]);
-                       }
+                       assert_eq!(w.0.len(), p);
+                       assert_eq!(&r.get_ref()[..$hole], &w.0[..$hole]);
+                       assert_eq!(&r.get_ref()[$hole + $hole_len..p], &w.0[$hole + $hole_len..]);
                }
-       }
+       }};
 }