Fix message targets to not have an internal loop

[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 cfe5a10e9b0896e91a861052e13f458c6abe79a8..4d355585da5d18d42dceaabdd8188953e038c3f8 100644 (file)
--- a/fuzz/fuzz_targets/msg_targets/utils.rs
+++ b/fuzz/fuzz_targets/msg_targets/utils.rs
@@ -1,50 +1,13 @@
 #![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)
-}
-
 #[macro_export]
 macro_rules! test_msg {
-       ($MsgType: path, $data: ident, $read_pos: 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[..]);
-               }
-       }
-}
-
-#[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_export]
-macro_rules! get_slice {
-       ($data: ident, $read_pos: ident, $len: expr) => {
+       ($MsgType: path, $data: ident) => {
                {
-                       let slice_len = $len as usize;
-                       if $data.len() < $read_pos + slice_len {
-                               return;
+                       if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
+                               let enc = msg.encode();
+                               assert_eq!(&$data[..enc.len()], &enc[..]);
                        }
-                       $read_pos += slice_len;
-                       &$data[$read_pos - slice_len..$read_pos]
                }
        }
 }