What the developer wrote
Authored by Jeffrey Czyz
Fix silent merge conflict
RecipientOnionFields::secret_only requires an amount now, but when
do_abandon_splice_quiescent_action_on_shutdown was introduced it was
based on an earlier commit.
What changed, and why it matters
This is a tiny fix to a single test file so the project compiles after a recent API change. A helper function called secret_only now requires a payment amount to be passed alongside the payment secret. The test was written against the older version of that helper and broke when both changes landed together. There is no indication this affects real user funds, live code paths, or network security.
No security action needed. Treat as normal test maintenance / build fix.
Security signals we found
No security-relevant code change
Test-only change
API signature compatibility fix
No memory safety, cryptography, or consensus changes
Evidence from the diff
The commit updates splicing_tests.rs to match a changed RecipientOnionFields::secret_only signature that now takes (payment_secret, payment_amount). The change is purely in test code: it introduces a payment_amount variable, passes it to get_route_and_payment_hash! and to RecipientOnionFields::secret_only. The commit title ‘Fix silent merge conflict’ confirms this is a build/test compatibility fix, not a functional or security patch.
Changed components
lightning/src/ln/splicing_tests.rsInspect captured patch +3 / −2
diff --git a/lightning/src/ln/splicing_tests.rs b/lightning/src/ln/splicing_tests.rs
index 1e92fb2..1e9ecf9 100644
--- a/lightning/src/ln/splicing_tests.rs
+++ b/lightning/src/ln/splicing_tests.rs
@@ -2429,9 +2429,10 @@ fn do_abandon_splice_quiescent_action_on_shutdown(local_shutdown: bool) {
// Since we cannot close after having sent `stfu`, send an HTLC so that when we attempt to
// splice, the `stfu` message is held back.
+ let payment_amount = 1_000_000;
let (route, payment_hash, _payment_preimage, payment_secret) =
- get_route_and_payment_hash!(&nodes[0], &nodes[1], 1_000_000);
- let onion = RecipientOnionFields::secret_only(payment_secret);
+ get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
+ let onion = RecipientOnionFields::secret_only(payment_secret, payment_amount);
let payment_id = PaymentId(payment_hash.0);
nodes[0].node.send_payment_with_route(route, payment_hash, onion, payment_id).unwrap();
let update = get_htlc_update_msgs(&nodes[0], &node_id_1);
Why this scored 16/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.