f simplify fuzzing

Author: joostjager

fuzz/src/process_onion_failure.rs

@@ -32,12 +32,6 @@ fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 		}};
 	}
 
-	macro_rules! get_u8 {
-		() => {
-			get_slice!(1)[0]
-		};
-	}
-
 	macro_rules! get_u16 {
 		() => {
 			match get_slice!(2).try_into() {
@@ -47,92 +41,73 @@ fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 		};
 	}
 
-	macro_rules! get_u32 {
+	macro_rules! get_bool {
 		() => {
-			match get_slice!(4).try_into() {
-				Ok(val) => u32::from_be_bytes(val),
-				Err(_) => return,
-			}
+			get_slice!(1)[0] & 1 != 0
 		};
 	}
 
-	macro_rules! get_u64 {
-		() => {
-			match get_slice!(8).try_into() {
-				Ok(val) => u64::from_be_bytes(val),
-				Err(_) => return,
-			}
-		};
+	fn usize_to_32_bytes(input: usize) -> [u8; 32] {
+		let mut bytes = [0u8; 32];
+		let input_bytes = input.to_be_bytes();
+		bytes[..input_bytes.len()].copy_from_slice(&input_bytes);
+		bytes
 	}
 
-	macro_rules! get_bool {
-		() => {
-			get_slice!(1)[0] != 0
-		};
-	}
+	fn usize_to_pubkey(input: usize) -> PublicKey {
+		let bytes = usize_to_32_bytes(1 + input);
 
-	macro_rules! get_pubkey {
-		() => {
-			match PublicKey::from_slice(get_slice!(33)) {
-				Ok(val) => val,
-				Err(_) => return,
-			}
-		};
+		let secp_ctx = Secp256k1::new();
+		let secret_key = SecretKey::from_slice(&bytes).unwrap();
+		secret_key.public_key(&secp_ctx)
 	}
 
 	let secp_ctx = Secp256k1::new();
 	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
 
-	let session_priv = match SecretKey::from_slice(get_slice!(32)) {
-		Ok(val) => val,
-		Err(_) => return,
-	};
-
-	let payment_id = match get_slice!(32).try_into() {
-		Ok(val) => PaymentId(val),
-		Err(_) => return,
-	};
+	let session_priv = SecretKey::from_slice(&usize_to_32_bytes(213127)).unwrap();
+	let payment_id = PaymentId(usize_to_32_bytes(232299));
 
 	let mut hops = Vec::<RouteHop>::new();
-	let hop_count = get_slice!(1)[0] as usize;
-	for _ in 0..hop_count {
+	let hop_count = get_slice!(1)[0] as usize % 30;
+	for i in 0..hop_count {
 		hops.push(RouteHop {
-			pubkey: get_pubkey!(),
+			pubkey: usize_to_pubkey(i),
 			node_features: NodeFeatures::empty(),
-			short_channel_id: get_u64!(),
+			short_channel_id: i as u64,
 			channel_features: ChannelFeatures::empty(),
-			fee_msat: get_u64!(),
-			cltv_expiry_delta: get_u32!(),
-			maybe_announced_channel: get_bool!(),
+			fee_msat: 0,
+			cltv_expiry_delta: 0,
+			maybe_announced_channel: false,
 		});
 	}
 
 	let blinded_tail = match get_bool!() {
 		true => {
 			let mut trampoline_hops = Vec::<TrampolineHop>::new();
-			let trampoline_hop_count = get_slice!(1)[0] as usize;
-			for _ in 0..trampoline_hop_count {
+			let trampoline_hop_count = get_slice!(1)[0] as usize % 30;
+			for i in 0..trampoline_hop_count {
 				trampoline_hops.push(TrampolineHop {
-					pubkey: get_pubkey!(),
+					pubkey: usize_to_pubkey(1000 + i),
 					node_features: NodeFeatures::empty(),
-					fee_msat: get_u64!(),
-					cltv_expiry_delta: get_u32!(),
+					fee_msat: 0,
+					cltv_expiry_delta: 0,
 				});
 			}
 			let mut blinded_hops = Vec::<BlindedHop>::new();
-			let blinded_hop_count = get_slice!(1)[0] as usize;
-			for _ in 0..blinded_hop_count {
+			let blinded_hop_count = get_slice!(1)[0] as usize % 30;
+			for i in 0..blinded_hop_count {
 				blinded_hops.push(BlindedHop {
-					blinded_node_id: get_pubkey!(),
-					encrypted_payload: get_slice!(get_u8!()).to_vec(),
+					blinded_node_id: usize_to_pubkey(2000 + i),
+					encrypted_payload: get_slice!(get_u16!()).to_vec(),
 				});
 			}
 			Some(BlindedTail {
 				trampoline_hops,
 				hops: blinded_hops,
-				blinding_point: get_pubkey!(),
-				excess_final_cltv_expiry_delta: get_u32!(),
-				final_value_msat: get_u64!(),
+				blinding_point: usize_to_pubkey(64354334),
+				excess_final_cltv_expiry_delta: 0,
+				final_value_msat: 0,
 			})
 		},
 		false => None,
@@ -143,7 +118,7 @@ fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 	let htlc_source = HTLCSource::OutboundRoute {
 		path,
 		session_priv,
-		first_hop_htlc_msat: get_u64!(),
+		first_hop_htlc_msat: 0,
 		payment_id,
 	};