mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-26 07:32:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

DRY up unknown_features calculation

Browse source
This commit is contained in:
Elias Rohrer 2024-04-09 17:07:06 +02:00
parent 158ef6ffe3
commit 446c007939
No known key found for this signature in database
GPG key ID: 36153082BDF676FD
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lightning/src/ln/features.rs
View file

@ -771,15 +771,7 @@ impl<T: sealed::Context> Features<T> {
// unknown features. // unknown features.
self.flags.iter().enumerate().any(|(i, &byte)| { self.flags.iter().enumerate().any(|(i, &byte)| {
const REQUIRED_FEATURES: u8 = 0b01_01_01_01; const REQUIRED_FEATURES: u8 = 0b01_01_01_01;
const OPTIONAL_FEATURES: u8 = 0b10_10_10_10; let unknown_features = unset_features_mask_at_position(other, i);
let unknown_features = if i < other.flags.len() {
// Form a mask similar to !T::KNOWN_FEATURE_MASK only for `other`
!(other.flags[i]
| ((other.flags[i] >> 1) & REQUIRED_FEATURES)
| ((other.flags[i] << 1) & OPTIONAL_FEATURES))
} else {
0b11_11_11_11
};
(byte & (REQUIRED_FEATURES & unknown_features)) != 0 (byte & (REQUIRED_FEATURES & unknown_features)) != 0
}) })
} }
@ -790,17 +782,7 @@ impl<T: sealed::Context> Features<T> {
// Bitwise AND-ing with all even bits set except for known features will select required // Bitwise AND-ing with all even bits set except for known features will select required
// unknown features. // unknown features.
self.flags.iter().enumerate().for_each(|(i, &byte)| { self.flags.iter().enumerate().for_each(|(i, &byte)| {
const REQUIRED_FEATURES: u8 = 0b01_01_01_01; let unknown_features = unset_features_mask_at_position(other, i);
const OPTIONAL_FEATURES: u8 = 0b10_10_10_10;
let unknown_features = if i < other.flags.len() {
// Form a mask similar to !T::KNOWN_FEATURE_MASK only for `other`
!(other.flags[i]
| ((other.flags[i] >> 1) & REQUIRED_FEATURES)
| ((other.flags[i] << 1) & OPTIONAL_FEATURES))
} else {
0b11_11_11_11
};
if byte & unknown_features != 0 { if byte & unknown_features != 0 {
for bit in (0..8).step_by(2) { for bit in (0..8).step_by(2) {
if ((byte & unknown_features) >> bit) & 1 == 1 { if ((byte & unknown_features) >> bit) & 1 == 1 {
@ -1047,6 +1029,19 @@ impl<T: sealed::Context> Readable for WithoutLength<Features<T>> {
} }
} }
pub(crate) fn unset_features_mask_at_position<T: sealed::Context>(other: &Features<T>, index: usize) -> u8 {
const REQUIRED_FEATURES: u8 = 0b01_01_01_01;
const OPTIONAL_FEATURES: u8 = 0b10_10_10_10;
if index < other.flags.len() {
// Form a mask similar to !T::KNOWN_FEATURE_MASK only for `other`
!(other.flags[index]
| ((other.flags[index] >> 1) & REQUIRED_FEATURES)
| ((other.flags[index] << 1) & OPTIONAL_FEATURES))
} else {
0b11_11_11_11
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, Bolt11InvoiceFeatures, NodeFeatures, OfferFeatures, sealed}; use super::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, Bolt11InvoiceFeatures, NodeFeatures, OfferFeatures, sealed};