X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Fchannel_target.rs;h=04a3caccadcb85d08389acede83112729c63d6d0;hb=4ca5bcf8cfc5cb3868974028b23ab7829c21426b;hp=6b24d700eb02b424b874301ed62e132a0a2f9f7f;hpb=da014797b0e9b36a160541cccad454c09200706a;p=rust-lightning

diff --git a/fuzz/fuzz_targets/channel_target.rs b/fuzz/fuzz_targets/channel_target.rs
index 6b24d700..04a3cacc 100644
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@ -8,17 +8,23 @@ use bitcoin::util::hash::Sha256dHash;
 use bitcoin::network::serialize::{serialize, BitcoinHash};
 
 use lightning::ln::channel::{Channel, ChannelKeys};
-use lightning::ln::channelmanager::{HTLCFailReason, PendingForwardHTLCInfo};
+use lightning::ln::channelmanager::{HTLCFailReason, PendingHTLCStatus};
 use lightning::ln::msgs;
 use lightning::ln::msgs::{MsgDecodable, ErrorAction};
 use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
 use lightning::chain::transaction::OutPoint;
 use lightning::util::reset_rng_state;
+use lightning::util::logger::Logger;
+
+mod utils;
+
+use utils::test_logger;
 
 use secp256k1::key::{PublicKey, SecretKey};
 use secp256k1::Secp256k1;
 
 use std::sync::atomic::{AtomicUsize,Ordering};
+use std::sync::Arc;
 
 #[inline]
 pub fn slice_to_be16(v: &[u8]) -> u16 {
@@ -101,6 +107,8 @@ pub fn do_test(data: &[u8]) {
 		input: &input,
 	};
 
+	let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{});
+
 	macro_rules! get_slice {
 		($len: expr) => {
 			match input.get_slice($len as usize) {
@@ -191,7 +199,10 @@ pub fn do_test(data: &[u8]) {
 	let mut channel = if get_slice!(1)[0] != 0 {
 		let chan_value = slice_to_be24(get_slice!(3));
 
-		let mut chan = Channel::new_outbound(&fee_est, chan_keys!(), their_pubkey, chan_value, get_slice!(1)[0] == 0, slice_to_be64(get_slice!(8)));
+		let mut chan = match Channel::new_outbound(&fee_est, chan_keys!(), their_pubkey, chan_value, slice_to_be24(get_slice!(3)), get_slice!(1)[0] == 0, slice_to_be64(get_slice!(8)), Arc::clone(&logger)) {
+			Ok(chan) => chan,
+			Err(_) => return,
+		};
 		chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est).unwrap();
 		let accept_chan = if get_slice!(1)[0] == 0 {
 			decode_msg_with_len16!(msgs::AcceptChannel, 270, 1)
@@ -213,7 +224,7 @@ pub fn do_test(data: &[u8]) {
 		} else {
 			decode_msg!(msgs::OpenChannel, 2*32+6*8+4+2*2+6*33+1)
 		};
-		let mut chan = match Channel::new_from_req(&fee_est, chan_keys!(), their_pubkey, &open_chan, slice_to_be64(get_slice!(8)), false, get_slice!(1)[0] == 0) {
+		let mut chan = match Channel::new_from_req(&fee_est, chan_keys!(), their_pubkey, &open_chan, slice_to_be64(get_slice!(8)), false, get_slice!(1)[0] == 0, Arc::clone(&logger)) {
 			Ok(chan) => chan,
 			Err(_) => return,
 		};
@@ -245,7 +256,6 @@ pub fn do_test(data: &[u8]) {
 				Ok(r) => Some(r),
 				Err(e) => match e.action {
 					None => return,
-					Some(ErrorAction::UpdateFailHTLC {..}) => None,
 					Some(ErrorAction::DisconnectPeer {..}) => return,
 					Some(ErrorAction::IgnoreError) => None,
 					Some(ErrorAction::SendErrorMessage {..}) => None,
@@ -269,7 +279,7 @@ pub fn do_test(data: &[u8]) {
 			},
 			2 => {
 				let update_add_htlc = decode_msg!(msgs::UpdateAddHTLC, 32+8+8+32+4+4+33+20*65+32);
-				test_err!(channel.update_add_htlc(&update_add_htlc, PendingForwardHTLCInfo::dummy()));
+				test_err!(channel.update_add_htlc(&update_add_htlc, PendingHTLCStatus::dummy()));
 			},
 			3 => {
 				let update_fulfill_htlc = decode_msg!(msgs::UpdateFulfillHTLC, 32 + 8 + 32);
@@ -314,11 +324,11 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[cfg(feature = "afl")]
-extern crate afl;
+#[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
 fn main() {
-	afl::read_stdio_bytes(|data| {
-		do_test(&data);
+	fuzz!(|data| {
+		do_test(data);
 	});
 }
 
@@ -333,29 +343,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());
 	}
 }