Trivial post-#3604 cleanups #3631
Open
+27
−37
Conversation
This file contains 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
e23d32d removed support for reading ancient `Channel`s but left a bit of cleanup for later. Here we clean up deserialization a bit by removing old v1 channel read logic.
e23d32d removed support for reading ancient `Channel`s but left a bit of cleanup for later. Here we mark a few TLVs as `required` which were always written in 0.0.113.
21ed477 got rewritten a few times before it landed and ended up with a spurious set call which is redaundant against the parameter passed in to `ReadableArgs`. This removes that set.
wpaulino
reviewed
Feb 28, 2025
| // `user_id` used to be a single u64 value. In order to remain backwards compatible with | ||
| // versions prior to 0.0.113, the u128 is serialized as two separate u64 values. We read | ||
| // the low bytes now and the high bytes later. | ||
| let user_id_low: u64 = Readable::read(reader)?; | ||
|
|
||
| let mut config = Some(LegacyChannelConfig::default()); | ||
| if ver == 1 { |
There was a problem hiding this comment.
There's a few more of these further down this method
There was a problem hiding this comment.
@TheBlueMatt Yeah, see #3632. Didn't see this PR before opening that. Happy to close it if you prefer.
There was a problem hiding this comment.
Cherry-picked the extra commit on that branch in case you want to take it.
jkczyz
reviewed
Feb 28, 2025
| @@ -10305,22 +10305,17 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch | |||
| let (entropy_source, signer_provider, serialized_height, our_supported_features) = args; | |||
| let ver = read_ver_prefix!(reader, SERIALIZATION_VERSION); | |||
|
|
|||
| if ver <= 2 { | |||
| return Err(DecodeError::InvalidValue); | |||
There was a problem hiding this comment.
FWIW, #3632 uses UnknownVersion instead. Not sure which you'd prefer.
| // `user_id` used to be a single u64 value. In order to remain backwards compatible with | ||
| // versions prior to 0.0.113, the u128 is serialized as two separate u64 values. We read | ||
| // the low bytes now and the high bytes later. | ||
| let user_id_low: u64 = Readable::read(reader)?; | ||
|
|
||
| let mut config = Some(LegacyChannelConfig::default()); | ||
| if ver == 1 { |
There was a problem hiding this comment.
Cherry-picked the extra commit on that branch in case you want to take it.
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.
A few small cleanups to channel read. I'm sure there's more that can be cleaned up.