Followups to onion_message rustfmt
#3582
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
In 3c3e93e we ran rustfmt blindly on `lightning/src/onion_message/functional_tests.rs`. This left the file with a handful of warts that really should have been cleaned up as we went. Here we clean up types a bit by importing structs directly and adding a few type aliases.
In 3c3e93e we ran rustfmt blindly on `lightning/src/onion_message/functional_tests.rs`. This left the file with a handful of warts that really should have been cleaned up as we went. Here we clean up a handful of rustfmt-isms, ranging from terrible to somewhat ugly, introduced in `functional_tests.rs`.
In 3c3e93e we ran rustfmt blindly on `lightning/src/onion_message/functional_tests.rs`. This left the file with a handful of warts that really should have been cleaned up as we went. Here we take the opportunity to clean up the `peer_buffer_full` test which used a constant for the number of messages we can push before the buffer fills, rather than calculating the amount based on the buffer size constant, also removing a comment that got moved by rustfmt into a place where it was no longer understandable.
In ecbab29 we ran rustfmt blindly on `lightning/src/onion_message/messenger.rs`. This exposed a few untidy things in the file and made them worse, which we should have cleaned up as we went. Here we address these, removing some unnecessary generics, condensing some lines by adding intermediate variables, and reducing very vertical match statements.
tnull
approved these changes
Feb 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As we
rustfmtfiles, we should try to clean them up. Some lines we have are too long for reasons unrelated to actually needing to be long, and often really could use some intermediate variables to make things more readable.In one case we also should have used a constant in a test, which rustfmt made more confusing because the comment was moved down below the for loop and no longer was referencing the for loop.
In one further case rustfmt made a total mess of some generics that were actually unnecessary and could just be removed.