Clean up create_onion_keys_callback_generic
#3668
Conversation
|
👋 Thanks for assigning @arik-so as a reviewer! |
|
🔔 1st Reminder Hey @valentinewallace! This PR has been waiting for your review. |
|
👋 The first review has been submitted! Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer. |
lightning/src/ln/onion_utils.rs
Outdated
| ) | ||
| .expect("Route we used spontaneously grew invalid keys in the middle of it?"); | ||
| // if we have Trampoline hops, the blinded hops are part of the inner Trampoline onion | ||
| let nontrampoline_bp = |
There was a problem hiding this comment.
this is not a blinding_point, it's the blinded_tail. Also, you think it makes sense to unify the terminology between non_trampoline_ and/or outer?
There was a problem hiding this comment.
Hmm, but there's no inner/outer if there's no trampoline?
There was a problem hiding this comment.
hm, I guess that's fair. Do switch it to _bt though, or, preferably, _blinded_tail.
There's no reason for anything outside of `onion_utils` to call an `_inner` method, so it shouldn't be pub.
Onion keys construction can only fail if we have a key which is the inverse of a hash containing a public key which we generated (even indirectly). Because we prefer to panic if our RNG creates an insecure key (as it indicates operating is incredibly unsafe), we thus don't actually need to return an error from `construct_onion_keys_generic_callback`, which we clean up here.
The onion keys building logic is rather ancient and predates the `-> impl Trait` syntax in Rust, and thus used a callback. Here we move it to an `impl Iterator` which is much Rustier and cleans up the code a bit.
Now that `create_onion_keys_generic` returns an iterator rather than relying on a callback, making `process_onion_failure_inner` chain the non-trampoline and trampoline iterators is trivial. We do so here, avoiding the extra vec allocation.
TheBlueMatt
force-pushed
the
2025-03-iterators-not-callbacks
branch
from
c77c1ed to
51f8cb7
Compare
|
Oops, forgot about this one. Rebased and addressed comments. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3668 +/- ##
==========================================
+ Coverage 89.13% 89.17% +0.03%
==========================================
Files 155 155
Lines 120796 120764 -32
Branches 120796 120764 -32
==========================================
+ Hits 107675 107689 +14
+ Misses 10458 10429 -29
+ Partials 2663 2646 -17 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
It should return an iterator, not rely on callbacks (I think it predates
impl Iteratorlol) and doesn't need to return aResult.