Minor code cleanups in chainmonitor.rs
#3869
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I've assigned @jkczyz as a reviewer! |
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
TheBlueMatt
force-pushed
the
2025-06-3847-followups
branch
from
a8a5e6b to
6559164
Compare
valentinewallace
previously approved these changes
Jun 17, 2025
Contributor
|
CI is sad |
In c356070 we ran `rustfmt` on all of `chainmonitor.rs`, but left a few expressions in `test_async_ooo_offchain_updates` exceedingly vertical (with redundant code across both `c_bindings` compile modes). Here we reduce redundant code to simplify the expressions, reducing verticality as a side effect.
In functional tests we're slowly moving towards using `node_*_id` variables to access node ids rather than writing out `nodes[*].node.get_our_node_id()` each time. This somewhat improves readability by reducing cognitive load, so is generally nice to do as we go through rustfmt-induced changes anyway. Here we make the swap in `chainmonitor.rs` functional tests.
TheBlueMatt
force-pushed
the
2025-06-3847-followups
branch
from
6559164 to
3a862a3
Compare
Collaborator
Author
|
Ugh, sorry, forgot to let the script run long enough locally: $ git diff-tree -U2 6559164dbb 3a862a3f97
diff --git a/lightning/src/chain/chainmonitor.rs b/lightning/src/chain/chainmonitor.rs
index 326eaeb784..46ede6fd85 100644
--- a/lightning/src/chain/chainmonitor.rs
+++ b/lightning/src/chain/chainmonitor.rs
@@ -1317,5 +1317,5 @@ mod tests {
#[cfg(c_bindings)]
let pending_chan_updates =
- pending_updates.iter().find(|(chan_id, _)| *chan_id == channel_id).unwrap().1;
+ &pending_updates.iter().find(|(chan_id, _)| *chan_id == channel_id).unwrap().1;
assert!(pending_chan_updates.contains(&next_update));
@@ -1328,5 +1328,5 @@ mod tests {
#[cfg(c_bindings)]
let pending_chan_updates =
- pending_updates.iter().find(|(chan_id, _)| *chan_id == channel_id).unwrap().1;
+ &pending_updates.iter().find(|(chan_id, _)| *chan_id == channel_id).unwrap().1;
assert!(!pending_chan_updates.contains(&next_update)); |
tnull
approved these changes
Jun 18, 2025
Contributor
tnull
left a comment
tnull
left a comment
There was a problem hiding this comment.
LGTM
Going ahead and landing this since the diff since Val's ACK is trivial.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.