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

Add PeerManager::init_features to DRY up code

Browse source
This commit is contained in:
Jeffrey Czyz 2023-04-18 12:23:20 -05:00
parent 415973eaa3
commit 21708b597e
No known key found for this signature in database
GPG key ID: 3A4E08275D5E96D2
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lightning/src/ln/peer_handler.rs
View file

@ -870,6 +870,13 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
SecretKey::from_slice(&Sha256::from_engine(ephemeral_hash).into_inner()).expect("You broke SHA-256!") SecretKey::from_slice(&Sha256::from_engine(ephemeral_hash).into_inner()).expect("You broke SHA-256!")
} }
fn init_features(&self, their_node_id: &PublicKey) -> InitFeatures {
self.message_handler.chan_handler.provided_init_features(their_node_id)
| self.message_handler.route_handler.provided_init_features(their_node_id)
| self.message_handler.onion_message_handler.provided_init_features(their_node_id)
| self.message_handler.custom_message_handler.provided_init_features(their_node_id)
}
/// Indicates a new outbound connection has been established to a node with the given `node_id` /// Indicates a new outbound connection has been established to a node with the given `node_id`
/// and an optional remote network address. /// and an optional remote network address.
/// ///
@ -1265,10 +1272,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
peer.set_their_node_id(their_node_id); peer.set_their_node_id(their_node_id);
insert_node_id!(); insert_node_id!();
let features = self.message_handler.chan_handler.provided_init_features(&their_node_id) let features = self.init_features(&their_node_id);
| self.message_handler.route_handler.provided_init_features(&their_node_id)
| self.message_handler.onion_message_handler.provided_init_features(&their_node_id)
| self.message_handler.custom_message_handler.provided_init_features(&their_node_id);
let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) }; let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
self.enqueue_message(peer, &resp); self.enqueue_message(peer, &resp);
peer.awaiting_pong_timer_tick_intervals = 0; peer.awaiting_pong_timer_tick_intervals = 0;
@ -1280,10 +1284,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
peer.pending_read_is_header = true; peer.pending_read_is_header = true;
peer.set_their_node_id(their_node_id); peer.set_their_node_id(their_node_id);
insert_node_id!(); insert_node_id!();
let features = self.message_handler.chan_handler.provided_init_features(&their_node_id) let features = self.init_features(&their_node_id);
| self.message_handler.route_handler.provided_init_features(&their_node_id)
| self.message_handler.onion_message_handler.provided_init_features(&their_node_id)
| self.message_handler.custom_message_handler.provided_init_features(&their_node_id);
let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) }; let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
self.enqueue_message(peer, &resp); self.enqueue_message(peer, &resp);
peer.awaiting_pong_timer_tick_intervals = 0; peer.awaiting_pong_timer_tick_intervals = 0;