Merge pull request #136 from TheBlueMatt/2018-08-excess-signed-data-bolt-7

[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 4d355585da5d18d42dceaabdd8188953e038c3f8..64bfd89326b4e8d3aa1e12c2bdd6f0323d929b8e 100644 (file)
--- a/fuzz/fuzz_targets/msg_targets/utils.rs
+++ b/fuzz/fuzz_targets/msg_targets/utils.rs
@@ -12,21 +12,27 @@ macro_rules! test_msg {
        }
 }
 
-#[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"),
+#[macro_export]
+macro_rules! test_msg_exact {
+       ($MsgType: path, $data: ident) => {
+               {
+                       if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
+                               let enc = msg.encode();
+                               assert_eq!(&$data[..], &enc[..]);
+                       }
                }
-               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) => {
+               {
+                       if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
+                               let enc = msg.encode();
+                               assert_eq!(&$data[..$hole], &enc[..$hole]);
+                               assert_eq!(&$data[$hole + $hole_len..enc.len()], &enc[$hole + $hole_len..]);
+                       }
                }
        }
 }