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

Remove unnecessary feature test-only methods

Browse source
This commit is contained in:
Jeffrey Czyz 2021-07-14 16:15:00 -07:00
parent 7497ed2402
commit 06ecbecd6d
No known key found for this signature in database
GPG key ID: 3A4E08275D5E96D2
2 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -301,27 +301,7 @@ mod sealed {
set_shutdown_any_segwit_required); set_shutdown_any_segwit_required);
#[cfg(test)] #[cfg(test)]
define_context!(TestingContext { define_feature!(123456789, UnknownFeature, [NodeContext, ChannelContext],
required_features: [
// Byte 0
,
// Byte 1
,
// Byte 2
UnknownFeature,
],
optional_features: [
// Byte 0
,
// Byte 1
,
// Byte 2
,
],
});
#[cfg(test)]
define_feature!(23, UnknownFeature, [TestingContext],
"Feature flags for an unknown feature used in testing.", set_unknown_feature_optional, "Feature flags for an unknown feature used in testing.", set_unknown_feature_optional,
set_unknown_feature_required); set_unknown_feature_required);
} }
@ -553,21 +533,6 @@ impl<T: sealed::Context> Features<T> {
pub(crate) fn byte_count(&self) -> usize { pub(crate) fn byte_count(&self) -> usize {
self.flags.len() self.flags.len()
} }
#[cfg(test)]
pub(crate) fn set_required_unknown_bits(&mut self) {
<sealed::TestingContext as sealed::UnknownFeature>::set_required_bit(&mut self.flags);
}
#[cfg(test)]
pub(crate) fn set_optional_unknown_bits(&mut self) {
<sealed::TestingContext as sealed::UnknownFeature>::set_optional_bit(&mut self.flags);
}
#[cfg(test)]
pub(crate) fn clear_unknown_bits(&mut self) {
<sealed::TestingContext as sealed::UnknownFeature>::clear_bits(&mut self.flags);
}
} }
impl<T: sealed::DataLossProtect> Features<T> { impl<T: sealed::DataLossProtect> Features<T> {
@ -765,19 +730,15 @@ mod tests {
#[test] #[test]
fn sanity_test_unknown_bits() { fn sanity_test_unknown_bits() {
let mut features = ChannelFeatures::empty(); let features = ChannelFeatures::empty();
assert!(!features.requires_unknown_bits()); assert!(!features.requires_unknown_bits());
assert!(!features.supports_unknown_bits()); assert!(!features.supports_unknown_bits());
features.set_required_unknown_bits(); let features = ChannelFeatures::empty().set_unknown_feature_required();
assert!(features.requires_unknown_bits()); assert!(features.requires_unknown_bits());
assert!(features.supports_unknown_bits()); assert!(features.supports_unknown_bits());
features.clear_unknown_bits(); let features = ChannelFeatures::empty().set_unknown_feature_optional();
assert!(!features.requires_unknown_bits());
assert!(!features.supports_unknown_bits());
features.set_optional_unknown_bits();
assert!(!features.requires_unknown_bits()); assert!(!features.requires_unknown_bits());
assert!(features.supports_unknown_bits()); assert!(features.supports_unknown_bits());
} }

3
lightning/src/routing/router.rs
View file

@ -1992,8 +1992,7 @@ mod tests {
let (_, our_id, privkeys, nodes) = get_nodes(&secp_ctx); let (_, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
// Disable nodes 1, 2, and 8 by requiring unknown feature bits // Disable nodes 1, 2, and 8 by requiring unknown feature bits
let mut unknown_features = NodeFeatures::known(); let unknown_features = NodeFeatures::known().set_unknown_feature_required();
unknown_features.set_required_unknown_bits();
add_or_update_node(&net_graph_msg_handler, &secp_ctx, &privkeys[0], unknown_features.clone(), 1); add_or_update_node(&net_graph_msg_handler, &secp_ctx, &privkeys[0], unknown_features.clone(), 1);
add_or_update_node(&net_graph_msg_handler, &secp_ctx, &privkeys[1], unknown_features.clone(), 1); add_or_update_node(&net_graph_msg_handler, &secp_ctx, &privkeys[1], unknown_features.clone(), 1);
add_or_update_node(&net_graph_msg_handler, &secp_ctx, &privkeys[7], unknown_features.clone(), 1); add_or_update_node(&net_graph_msg_handler, &secp_ctx, &privkeys[7], unknown_features.clone(), 1);