From 08b803b6e7d24ddb85eb4e6678647509eb562af0 Mon Sep 17 00:00:00 2001
From: Kirk Baird <kirk@sigmaprime.io>
Date: Thu, 7 Mar 2019 17:50:00 +1100
Subject: [PATCH] Modifications to fuzz tests

---
 eth2/utils/ssz/fuzz/Cargo.toml                       | 12 ++++++++++++
 .../fuzz_targets/fuzz_target_vec_address_decode.rs   | 12 ++++++++++++
 .../fuzz/fuzz_targets/fuzz_target_vec_bool_decode.rs | 10 ++++++++++
 .../ssz/fuzz/fuzz_targets/fuzz_target_vec_decode.rs  |  9 ---------
 .../ssz/fuzz/fuzz_targets/fuzz_target_vec_encode.rs  |  2 +-
 .../fuzz/fuzz_targets/fuzz_target_vec_u64_decode.rs  | 10 ++++++++++
 6 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_address_decode.rs
 create mode 100644 eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_bool_decode.rs
 create mode 100644 eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_u64_decode.rs

diff --git a/eth2/utils/ssz/fuzz/Cargo.toml b/eth2/utils/ssz/fuzz/Cargo.toml
index c76cbbbdef..055d031a09 100644
--- a/eth2/utils/ssz/fuzz/Cargo.toml
+++ b/eth2/utils/ssz/fuzz/Cargo.toml
@@ -88,6 +88,18 @@ path = "fuzz_targets/fuzz_target_address_encode.rs"
 name = "fuzz_target_vec_decode"
 path = "fuzz_targets/fuzz_target_vec_decode.rs"
 
+[[bin]]
+name = "fuzz_target_vec_address_decode"
+path = "fuzz_targets/fuzz_target_vec_address_decode.rs"
+
+[[bin]]
+name = "fuzz_target_vec_u64_decode"
+path = "fuzz_targets/fuzz_target_vec_u64_decode.rs"
+
+[[bin]]
+name = "fuzz_target_vec_bool_decode"
+path = "fuzz_targets/fuzz_target_vec_bool_decode.rs"
+
 [[bin]]
 name = "fuzz_target_vec_encode"
 path = "fuzz_targets/fuzz_target_vec_encode.rs"
diff --git a/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_address_decode.rs b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_address_decode.rs
new file mode 100644
index 0000000000..6c686df1a9
--- /dev/null
+++ b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_address_decode.rs
@@ -0,0 +1,12 @@
+#![no_main]
+#[macro_use] extern crate libfuzzer_sys;
+extern crate ethereum_types;
+extern crate ssz;
+
+use ethereum_types::{Address};
+use ssz::{DecodeError, Decodable};
+
+// Fuzz ssz_decode()
+fuzz_target!(|data: &[u8]| {
+    let _result: Result<(Vec<Address>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
+});
diff --git a/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_bool_decode.rs b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_bool_decode.rs
new file mode 100644
index 0000000000..25017ef259
--- /dev/null
+++ b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_bool_decode.rs
@@ -0,0 +1,10 @@
+#![no_main]
+#[macro_use] extern crate libfuzzer_sys;
+extern crate ssz;
+
+use ssz::{DecodeError, Decodable};
+
+// Fuzz ssz_decode()
+fuzz_target!(|data: &[u8]| {
+    let _result: Result<(Vec<bool>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
+});
diff --git a/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_decode.rs b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_decode.rs
index 048d19ee57..cc1dc09f51 100644
--- a/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_decode.rs
+++ b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_decode.rs
@@ -9,13 +9,4 @@ use ssz::{DecodeError, Decodable};
 // Fuzz ssz_decode()
 fuzz_target!(|data: &[u8]| {
     let _result: Result<(Vec<u8>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    /*
-    let _result: Result<(Vec<u16>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    let _result: Result<(Vec<u32>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    let _result: Result<(Vec<u64>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    let _result: Result<(Vec<usize>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    let _result: Result<(Vec<Address>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    let _result: Result<(Vec<H256>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    let _result: Result<(Vec<bool>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
-    */
 });
diff --git a/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_encode.rs b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_encode.rs
index 6980e5d206..39500b7828 100644
--- a/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_encode.rs
+++ b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_encode.rs
@@ -6,7 +6,7 @@ extern crate ssz;
 use ethereum_types::{Address, H256};
 use ssz::SszStream;
 
-// Fuzz ssz_decode()
+// Fuzz ssz_encode()
 fuzz_target!(|data: &[u8]| {
 
     let mut ssz = SszStream::new();
diff --git a/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_u64_decode.rs b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_u64_decode.rs
new file mode 100644
index 0000000000..ee25a6378a
--- /dev/null
+++ b/eth2/utils/ssz/fuzz/fuzz_targets/fuzz_target_vec_u64_decode.rs
@@ -0,0 +1,10 @@
+#![no_main]
+#[macro_use] extern crate libfuzzer_sys;
+extern crate ssz;
+
+use ssz::{DecodeError, Decodable};
+
+// Fuzz ssz_decode()
+fuzz_target!(|data: &[u8]| {
+    let _result: Result<(Vec<u64>, usize), DecodeError> = Decodable::ssz_decode(data, 0);
+});