Merge pull request #414 from TheBlueMatt/2019-12-347-nits

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

diff --git a/fuzz/fuzz_targets/msg_targets/utils.rs b/fuzz/fuzz_targets/msg_targets/utils.rs
index cb4de5eb95441a269608efb216a7db025d7d33f9..a5257ba0f80c1fea24f399018103da37f572c763 100644 (file)
--- a/fuzz/fuzz_targets/msg_targets/utils.rs
+++ b/fuzz/fuzz_targets/msg_targets/utils.rs
@@ -1,69 +1,81 @@
 #![macro_use]
 
-#[allow(dead_code)]
-#[inline]
-pub fn slice_to_be16(v: &[u8]) -> u16 {
-         ((v[0] as u16) << 8*1) |
-                         ((v[1] as u16) << 8*0)
+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);
+       }
 }
 
 #[macro_export]
 macro_rules! test_msg {
-       ($MsgType: path, $data: ident, $read_pos: ident) => {
+       ($MsgType: path, $data: ident) => {
                {
-                       let len = slice_to_be16(get_slice!($data, $read_pos, 2));
-                       let raw = get_slice!($data, $read_pos, len);
-                       let cb = decode_msg!($MsgType, raw).encode();
-                       assert_eq!(&raw[..cb.len()], &cb[..]);
+                       use lightning::util::ser::{Writeable, Readable};
+                       let mut r = ::std::io::Cursor::new($data);
+                       if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::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]);
+                       }
                }
        }
 }
 
 #[macro_export]
-macro_rules! decode_msg {
-       ($MsgType: path, $data: expr) => {
-               match <($MsgType)>::decode($data) {
-                       Ok(msg) => msg,
-                       Err(e) => match e {
-                               msgs::DecodeError::UnknownRealmByte => return,
-                               msgs::DecodeError::BadPublicKey => return,
-                               msgs::DecodeError::BadSignature => return,
-                               msgs::DecodeError::ExtraAddressesPerType => return,
-                               msgs::DecodeError::WrongLength => return,
+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<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+                               let mut w = VecWriter(Vec::new());
+                               msg.write(&mut w).unwrap();
                        }
                }
        }
 }
 
 #[macro_export]
-macro_rules! get_slice {
-       ($data: ident, $read_pos: ident, $len: expr) => {
+macro_rules! test_msg_exact {
+       ($MsgType: path, $data: ident) => {
                {
-                       let slice_len = $len as usize;
-                       if $data.len() < $read_pos + slice_len {
-                               return;
+                       use lightning::util::ser::{Writeable, Readable};
+                       let mut r = ::std::io::Cursor::new($data);
+                       if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+                               let mut w = VecWriter(Vec::new());
+                               msg.write(&mut w).unwrap();
+
+                               assert_eq!(&r.into_inner()[..], &w.0[..]);
                        }
-                       $read_pos += slice_len;
-                       &$data[$read_pos - slice_len..$read_pos]
                }
        }
 }
 
-#[allow(dead_code)]
-#[cfg(test)]
-pub fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-       let mut b = 0;
-       for (idx, c) in hex.as_bytes().iter().enumerate() {
-               b <<= 4;
-               match *c {
-                       b'A'...b'F' => b |= c - b'A' + 10,
-                       b'a'...b'f' => b |= c - b'a' + 10,
-                       b'0'...b'9' => b |= c - b'0',
-                       _ => panic!("Bad hex"),
-               }
-               if (idx & 1) == 1 {
-                       out.push(b);
-                       b = 0;
+#[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<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+                               let mut w = VecWriter(Vec::new());
+                               msg.write(&mut w).unwrap();
+                               let p = w.0.len() as usize;
+
+                               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..]);
+                       }
                }
        }
 }