← Watch feed
fuzz: convert send helpers to closures with node indices
Public commit record
83/100 · Strong
What the developer wrote
Authored by Joost Jager
fuzz: convert send helpers to closures with node indices
Replace the standalone `send_noret` and `send_hop_noret` functions with
closures defined inside the main loop. This allows them to capture the
`nodes` array and use simple node indices (0, 1, 2) instead of passing
`&nodes[x]` references at each call site.
The `send_payment` and `send_hop_payment` functions are modified to take
pre-computed `PaymentSecret`, `PaymentHash`, and `PaymentId` parameters,
with the closures handling the credential generation. This centralizes
where `PaymentId` is constructed, which will make it easier to add
payment tracking in a future change.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Matt Corallo <git@bluematt.me>
✓ Specific, descriptive subject✓ Names a concrete action or component✓ Provides detailed explanatory context✓ Mentions testing or verification
What changed, and why it matters
This commit is a code cleanup inside a fuzzing test file. It converts helper functions into closures and changes how payment identifiers are passed around. There is no change to the actual Lightning node logic that runs in production, and nothing in the commit suggests a security fix or vulnerability.
Recommended action
No security action needed. Treat as ordinary test-code refactoring.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The patch refactors fuzz/src/chanmon_consistency.rs. Standalone send_noret/send_hop_noret wrappers are removed, send_payment and send_hop_payment now accept pre-computed PaymentSecret, PaymentHash, and PaymentId, and new closures inside do_test generate those credentials and dispatch calls using node indices. The behavior of the fuzz target is unchanged; only call-site syntax and credential-generation location differ.
Changed components
fuzz/src/chanmon_consistency.rsInspect captured patch +91 / −108
diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs
index 7cc7986..1bcb669 100644
--- a/fuzz/src/chanmon_consistency.rs
+++ b/fuzz/src/chanmon_consistency.rs
@@ -553,20 +553,11 @@ fn get_payment_secret_hash(dest: &ChanMan, payment_ctr: &mut u64) -> (PaymentSec
(payment_secret, payment_hash)
}
-#[inline]
-fn send_noret(
- source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, payment_ctr: &mut u64,
-) {
- send_payment(source, dest, dest_chan_id, amt, payment_ctr);
-}
-
#[inline]
fn send_payment(
- source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, payment_ctr: &mut u64,
+ source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, payment_secret: PaymentSecret,
+ payment_hash: PaymentHash, payment_id: PaymentId,
) -> bool {
- let (payment_secret, payment_hash) = get_payment_secret_hash(dest, payment_ctr);
- let mut payment_id = [0; 32];
- payment_id[0..8].copy_from_slice(&payment_ctr.to_ne_bytes());
let (min_value_sendable, max_value_sendable) = source
.list_usable_channels()
.iter()
@@ -593,7 +584,6 @@ fn send_payment(
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
- let payment_id = PaymentId(payment_id);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
@@ -608,22 +598,11 @@ fn send_payment(
}
}
-#[inline]
-fn send_hop_noret(
- source: &ChanMan, middle: &ChanMan, middle_scid: u64, dest: &ChanMan, dest_scid: u64, amt: u64,
- payment_ctr: &mut u64,
-) {
- send_hop_payment(source, middle, middle_scid, dest, dest_scid, amt, payment_ctr);
-}
-
#[inline]
fn send_hop_payment(
source: &ChanMan, middle: &ChanMan, middle_scid: u64, dest: &ChanMan, dest_scid: u64, amt: u64,
- payment_ctr: &mut u64,
+ payment_secret: PaymentSecret, payment_hash: PaymentHash, payment_id: PaymentId,
) -> bool {
- let (payment_secret, payment_hash) = get_payment_secret_hash(dest, payment_ctr);
- let mut payment_id = [0; 32];
- payment_id[0..8].copy_from_slice(&payment_ctr.to_ne_bytes());
let (min_value_sendable, max_value_sendable) = source
.list_usable_channels()
.iter()
@@ -662,7 +641,6 @@ fn send_hop_payment(
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
- let payment_id = PaymentId(payment_id);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
@@ -1634,6 +1612,35 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
}
};
+ let send =
+ |source_idx: usize, dest_idx: usize, dest_chan_id, amt, payment_ctr: &mut u64| {
+ let source = &nodes[source_idx];
+ let dest = &nodes[dest_idx];
+ let (secret, hash) = get_payment_secret_hash(dest, payment_ctr);
+ let mut id = PaymentId([0; 32]);
+ id.0[0..8].copy_from_slice(&payment_ctr.to_ne_bytes());
+ send_payment(source, dest, dest_chan_id, amt, secret, hash, id)
+ };
+ let send_noret = |source_idx, dest_idx, dest_chan_id, amt, payment_ctr: &mut u64| {
+ send(source_idx, dest_idx, dest_chan_id, amt, payment_ctr);
+ };
+
+ let send_hop_noret = |source_idx: usize,
+ middle_idx: usize,
+ middle_scid: u64,
+ dest_idx: usize,
+ dest_scid: u64,
+ amt: u64,
+ payment_ctr: &mut u64| {
+ let source = &nodes[source_idx];
+ let middle = &nodes[middle_idx];
+ let dest = &nodes[dest_idx];
+ let (secret, hash) = get_payment_secret_hash(dest, payment_ctr);
+ let mut id = PaymentId([0; 32]);
+ id.0[0..8].copy_from_slice(&payment_ctr.to_ne_bytes());
+ send_hop_payment(source, middle, middle_scid, dest, dest_scid, amt, secret, hash, id);
+ };
+
let v = get_slice!(1)[0];
out.locked_write(format!("READ A BYTE! HANDLING INPUT {:x}...........\n", v).as_bytes());
match v {
@@ -1746,85 +1753,61 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
0x27 => process_ev_noret!(2, false),
// 1/10th the channel size:
- 0x30 => send_noret(&nodes[0], &nodes[1], chan_a, 10_000_000, &mut p_ctr),
- 0x31 => send_noret(&nodes[1], &nodes[0], chan_a, 10_000_000, &mut p_ctr),
- 0x32 => send_noret(&nodes[1], &nodes[2], chan_b, 10_000_000, &mut p_ctr),
- 0x33 => send_noret(&nodes[2], &nodes[1], chan_b, 10_000_000, &mut p_ctr),
- 0x34 => send_hop_noret(
- &nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 10_000_000, &mut p_ctr,
- ),
- 0x35 => send_hop_noret(
- &nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 10_000_000, &mut p_ctr,
- ),
-
- 0x38 => send_noret(&nodes[0], &nodes[1], chan_a, 1_000_000, &mut p_ctr),
- 0x39 => send_noret(&nodes[1], &nodes[0], chan_a, 1_000_000, &mut p_ctr),
- 0x3a => send_noret(&nodes[1], &nodes[2], chan_b, 1_000_000, &mut p_ctr),
- 0x3b => send_noret(&nodes[2], &nodes[1], chan_b, 1_000_000, &mut p_ctr),
- 0x3c => send_hop_noret(
- &nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 1_000_000, &mut p_ctr,
- ),
- 0x3d => send_hop_noret(
- &nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 1_000_000, &mut p_ctr,
- ),
-
- 0x40 => send_noret(&nodes[0], &nodes[1], chan_a, 100_000, &mut p_ctr),
- 0x41 => send_noret(&nodes[1], &nodes[0], chan_a, 100_000, &mut p_ctr),
- 0x42 => send_noret(&nodes[1], &nodes[2], chan_b, 100_000, &mut p_ctr),
- 0x43 => send_noret(&nodes[2], &nodes[1], chan_b, 100_000, &mut p_ctr),
- 0x44 => {
- send_hop_noret(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 100_000, &mut p_ctr)
- },
- 0x45 => {
- send_hop_noret(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 100_000, &mut p_ctr)
- },
-
- 0x48 => send_noret(&nodes[0], &nodes[1], chan_a, 10_000, &mut p_ctr),
- 0x49 => send_noret(&nodes[1], &nodes[0], chan_a, 10_000, &mut p_ctr),
- 0x4a => send_noret(&nodes[1], &nodes[2], chan_b, 10_000, &mut p_ctr),
- 0x4b => send_noret(&nodes[2], &nodes[1], chan_b, 10_000, &mut p_ctr),
- 0x4c => {
- send_hop_noret(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 10_000, &mut p_ctr)
- },
- 0x4d => {
- send_hop_noret(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 10_000, &mut p_ctr)
- },
-
- 0x50 => send_noret(&nodes[0], &nodes[1], chan_a, 1_000, &mut p_ctr),
- 0x51 => send_noret(&nodes[1], &nodes[0], chan_a, 1_000, &mut p_ctr),
- 0x52 => send_noret(&nodes[1], &nodes[2], chan_b, 1_000, &mut p_ctr),
- 0x53 => send_noret(&nodes[2], &nodes[1], chan_b, 1_000, &mut p_ctr),
- 0x54 => {
- send_hop_noret(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 1_000, &mut p_ctr)
- },
- 0x55 => {
- send_hop_noret(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 1_000, &mut p_ctr)
- },
-
- 0x58 => send_noret(&nodes[0], &nodes[1], chan_a, 100, &mut p_ctr),
- 0x59 => send_noret(&nodes[1], &nodes[0], chan_a, 100, &mut p_ctr),
- 0x5a => send_noret(&nodes[1], &nodes[2], chan_b, 100, &mut p_ctr),
- 0x5b => send_noret(&nodes[2], &nodes[1], chan_b, 100, &mut p_ctr),
- 0x5c => {
- send_hop_noret(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 100, &mut p_ctr)
- },
- 0x5d => {
- send_hop_noret(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 100, &mut p_ctr)
- },
-
- 0x60 => send_noret(&nodes[0], &nodes[1], chan_a, 10, &mut p_ctr),
- 0x61 => send_noret(&nodes[1], &nodes[0], chan_a, 10, &mut p_ctr),
- 0x62 => send_noret(&nodes[1], &nodes[2], chan_b, 10, &mut p_ctr),
- 0x63 => send_noret(&nodes[2], &nodes[1], chan_b, 10, &mut p_ctr),
- 0x64 => send_hop_noret(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 10, &mut p_ctr),
- 0x65 => send_hop_noret(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 10, &mut p_ctr),
-
- 0x68 => send_noret(&nodes[0], &nodes[1], chan_a, 1, &mut p_ctr),
- 0x69 => send_noret(&nodes[1], &nodes[0], chan_a, 1, &mut p_ctr),
- 0x6a => send_noret(&nodes[1], &nodes[2], chan_b, 1, &mut p_ctr),
- 0x6b => send_noret(&nodes[2], &nodes[1], chan_b, 1, &mut p_ctr),
- 0x6c => send_hop_noret(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 1, &mut p_ctr),
- 0x6d => send_hop_noret(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 1, &mut p_ctr),
+ 0x30 => send_noret(0, 1, chan_a, 10_000_000, &mut p_ctr),
+ 0x31 => send_noret(1, 0, chan_a, 10_000_000, &mut p_ctr),
+ 0x32 => send_noret(1, 2, chan_b, 10_000_000, &mut p_ctr),
+ 0x33 => send_noret(2, 1, chan_b, 10_000_000, &mut p_ctr),
+ 0x34 => send_hop_noret(0, 1, chan_a, 2, chan_b, 10_000_000, &mut p_ctr),
+ 0x35 => send_hop_noret(2, 1, chan_b, 0, chan_a, 10_000_000, &mut p_ctr),
+
+ 0x38 => send_noret(0, 1, chan_a, 1_000_000, &mut p_ctr),
+ 0x39 => send_noret(1, 0, chan_a, 1_000_000, &mut p_ctr),
+ 0x3a => send_noret(1, 2, chan_b, 1_000_000, &mut p_ctr),
+ 0x3b => send_noret(2, 1, chan_b, 1_000_000, &mut p_ctr),
+ 0x3c => send_hop_noret(0, 1, chan_a, 2, chan_b, 1_000_000, &mut p_ctr),
+ 0x3d => send_hop_noret(2, 1, chan_b, 0, chan_a, 1_000_000, &mut p_ctr),
+
+ 0x40 => send_noret(0, 1, chan_a, 100_000, &mut p_ctr),
+ 0x41 => send_noret(1, 0, chan_a, 100_000, &mut p_ctr),
+ 0x42 => send_noret(1, 2, chan_b, 100_000, &mut p_ctr),
+ 0x43 => send_noret(2, 1, chan_b, 100_000, &mut p_ctr),
+ 0x44 => send_hop_noret(0, 1, chan_a, 2, chan_b, 100_000, &mut p_ctr),
+ 0x45 => send_hop_noret(2, 1, chan_b, 0, chan_a, 100_000, &mut p_ctr),
+
+ 0x48 => send_noret(0, 1, chan_a, 10_000, &mut p_ctr),
+ 0x49 => send_noret(1, 0, chan_a, 10_000, &mut p_ctr),
+ 0x4a => send_noret(1, 2, chan_b, 10_000, &mut p_ctr),
+ 0x4b => send_noret(2, 1, chan_b, 10_000, &mut p_ctr),
+ 0x4c => send_hop_noret(0, 1, chan_a, 2, chan_b, 10_000, &mut p_ctr),
+ 0x4d => send_hop_noret(2, 1, chan_b, 0, chan_a, 10_000, &mut p_ctr),
+
+ 0x50 => send_noret(0, 1, chan_a, 1_000, &mut p_ctr),
+ 0x51 => send_noret(1, 0, chan_a, 1_000, &mut p_ctr),
+ 0x52 => send_noret(1, 2, chan_b, 1_000, &mut p_ctr),
+ 0x53 => send_noret(2, 1, chan_b, 1_000, &mut p_ctr),
+ 0x54 => send_hop_noret(0, 1, chan_a, 2, chan_b, 1_000, &mut p_ctr),
+ 0x55 => send_hop_noret(2, 1, chan_b, 0, chan_a, 1_000, &mut p_ctr),
+
+ 0x58 => send_noret(0, 1, chan_a, 100, &mut p_ctr),
+ 0x59 => send_noret(1, 0, chan_a, 100, &mut p_ctr),
+ 0x5a => send_noret(1, 2, chan_b, 100, &mut p_ctr),
+ 0x5b => send_noret(2, 1, chan_b, 100, &mut p_ctr),
+ 0x5c => send_hop_noret(0, 1, chan_a, 2, chan_b, 100, &mut p_ctr),
+ 0x5d => send_hop_noret(2, 1, chan_b, 0, chan_a, 100, &mut p_ctr),
+
+ 0x60 => send_noret(0, 1, chan_a, 10, &mut p_ctr),
+ 0x61 => send_noret(1, 0, chan_a, 10, &mut p_ctr),
+ 0x62 => send_noret(1, 2, chan_b, 10, &mut p_ctr),
+ 0x63 => send_noret(2, 1, chan_b, 10, &mut p_ctr),
+ 0x64 => send_hop_noret(0, 1, chan_a, 2, chan_b, 10, &mut p_ctr),
+ 0x65 => send_hop_noret(2, 1, chan_b, 0, chan_a, 10, &mut p_ctr),
+
+ 0x68 => send_noret(0, 1, chan_a, 1, &mut p_ctr),
+ 0x69 => send_noret(1, 0, chan_a, 1, &mut p_ctr),
+ 0x6a => send_noret(1, 2, chan_b, 1, &mut p_ctr),
+ 0x6b => send_noret(2, 1, chan_b, 1, &mut p_ctr),
+ 0x6c => send_hop_noret(0, 1, chan_a, 2, chan_b, 1, &mut p_ctr),
+ 0x6d => send_hop_noret(2, 1, chan_b, 0, chan_a, 1, &mut p_ctr),
0x80 => {
let mut max_feerate = last_htlc_clear_fee_a;
@@ -2256,12 +2239,12 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
// Finally, make sure that at least one end of each channel can make a substantial payment
assert!(
- send_payment(&nodes[0], &nodes[1], chan_a, 10_000_000, &mut p_ctr)
- || send_payment(&nodes[1], &nodes[0], chan_a, 10_000_000, &mut p_ctr)
+ send(0, 1, chan_a, 10_000_000, &mut p_ctr)
+ || send(1, 0, chan_a, 10_000_000, &mut p_ctr)
);
assert!(
- send_payment(&nodes[1], &nodes[2], chan_b, 10_000_000, &mut p_ctr)
- || send_payment(&nodes[2], &nodes[1], chan_b, 10_000_000, &mut p_ctr)
+ send(1, 2, chan_b, 10_000_000, &mut p_ctr)
+ || send(2, 1, chan_b, 10_000_000, &mut p_ctr)
);
last_htlc_clear_fee_a = fee_est_a.ret_val.load(atomic::Ordering::Acquire);
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.