Merge pull request #95 from savil/rm-bitcoin-util-hexbytes

replace use of bitcoin::utils::misc::hex_bytes with hex::decode

Author: TheBlueMatt

fuzz/Cargo.toml

@@ -16,12 +16,13 @@ afl_fuzz = ["afl"]
 honggfuzz_fuzz = ["honggfuzz"]
 
 [dependencies]
+afl = { version = "0.3", optional = true }
 lightning = { path = "..", features = ["fuzztarget"] }
 bitcoin = { version = "0.13", features = ["fuzztarget"] }
-secp256k1 = { version = "0.9", features=["fuzztarget"] }
-rust-crypto = "0.2"
+hex = "0.3.2"
 honggfuzz = { version = "0.5", optional = true }
-afl = { version = "0.3", optional = true }
+rust-crypto = "0.2"
+secp256k1 = { version = "0.9", features=["fuzztarget"] }
 
 [build-dependencies]
 cc = "1.0"

fuzz/fuzz_targets/chanmon_deser_target.rs

@@ -35,29 +35,12 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	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;
-			}
-		}
-	}
 
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/channel_target.rs

@@ -333,29 +333,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	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;
-			}
-		}
-	}
-
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/full_stack_target.rs

@@ -368,29 +368,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	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;
-			}
-		}
-	}
-
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_ping_target.rs

@@ -35,29 +35,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	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;
-			}
-		}
-	}
-
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_pong_target.rs

@@ -35,29 +35,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	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;
-			}
-		}
-	}
-
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_target_template.txt

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }

fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs

@@ -36,13 +36,11 @@ fn main() {
 	}
 }
 
+extern crate hex;
 #[cfg(test)]
 mod tests {
-	use utils::extend_vec_from_hex;
 	#[test]
 	fn duplicate_crash() {
-		let mut a = Vec::new();
-		extend_vec_from_hex("00", &mut a);
-		super::do_test(&a);
+		super::do_test(&::hex::decode("00").unwrap());
 	}
 }