f rename

Author: TheBlueMatt

lightning/src/ln/peer_handler.rs

@@ -42,11 +42,11 @@ use bitcoin::hashes::{HashEngine, Hash};
 
 /// A dummy struct which implements `RoutingMessageHandler` without storing any routing information
 /// or doing any processing. You can provide one of these as the route_handler in a MessageHandler.
-pub struct DummyRouteHandler{}
-impl MessageSendEventsProvider for DummyRouteHandler {
+struct IgnoringMessageHandler{}
+impl MessageSendEventsProvider for IgnoringMessageHandler {
 	fn get_and_clear_pending_msg_events(&self) -> Vec<MessageSendEvent> { Vec::new() }
 }
-impl RoutingMessageHandler for DummyRouteHandler {
+impl RoutingMessageHandler for IgnoringMessageHandler {
 	fn handle_node_announcement(&self, _msg: &msgs::NodeAnnouncement) -> Result<bool, LightningError> { Ok(false) }
 	fn handle_channel_announcement(&self, _msg: &msgs::ChannelAnnouncement) -> Result<bool, LightningError> { Ok(false) }
 	fn handle_channel_update(&self, _msg: &msgs::ChannelUpdate) -> Result<bool, LightningError> { Ok(false) }
@@ -60,18 +60,18 @@ impl RoutingMessageHandler for DummyRouteHandler {
 	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 }
-impl Deref for DummyRouteHandler {
-	type Target = DummyRouteHandler;
+impl Deref for IgnoringMessageHandler {
+	type Target = IgnoringMessageHandler;
 	fn deref(&self) -> &Self { self }
 }
 
 /// A dummy struct which implements `ChannelMessageHandler` without having any channels.
 /// You can provide one of these as the route_handler in a MessageHandler.
-pub struct DummyChannelHandler {
+struct ErroringMessageHandler {
 	message_queue: Mutex<Vec<MessageSendEvent>>
 }
-impl DummyChannelHandler {
-	/// Constructs a new DummyChannelHandler
+impl ErroringMessageHandler {
+	/// Constructs a new ErroringMessageHandler
 	pub fn new() -> Self {
 		Self { message_queue: Mutex::new(Vec::new()) }
 	}
@@ -84,70 +84,70 @@ impl DummyChannelHandler {
 		});
 	}
 }
-impl MessageSendEventsProvider for DummyChannelHandler {
+impl MessageSendEventsProvider for ErroringMessageHandler {
 	fn get_and_clear_pending_msg_events(&self) -> Vec<MessageSendEvent> {
 		let mut res = Vec::new();
 		mem::swap(&mut res, &mut self.message_queue.lock().unwrap());
 		res
 	}
 }
-impl ChannelMessageHandler for DummyChannelHandler {
+impl ChannelMessageHandler for ErroringMessageHandler {
 	// Any messages which are related to a specific channel generate an error message to let the
 	// peer know we don't care about channels.
 	fn handle_open_channel(&self, their_node_id: &PublicKey, _their_features: InitFeatures, msg: &msgs::OpenChannel) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.temporary_channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.temporary_channel_id);
 	}
 	fn handle_accept_channel(&self, their_node_id: &PublicKey, _their_features: InitFeatures, msg: &msgs::AcceptChannel) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.temporary_channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.temporary_channel_id);
 	}
 	fn handle_funding_created(&self, their_node_id: &PublicKey, msg: &msgs::FundingCreated) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.temporary_channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.temporary_channel_id);
 	}
 	fn handle_funding_signed(&self, their_node_id: &PublicKey, msg: &msgs::FundingSigned) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_funding_locked(&self, their_node_id: &PublicKey, msg: &msgs::FundingLocked) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_shutdown(&self, their_node_id: &PublicKey, _their_features: &InitFeatures, msg: &msgs::Shutdown) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &msgs::ClosingSigned) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_update_add_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateAddHTLC) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_update_fulfill_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFulfillHTLC) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_update_fail_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFailHTLC) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_update_fail_malformed_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFailMalformedHTLC) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_commitment_signed(&self, their_node_id: &PublicKey, msg: &msgs::CommitmentSigned) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_revoke_and_ack(&self, their_node_id: &PublicKey, msg: &msgs::RevokeAndACK) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_update_fee(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFee) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_announcement_signatures(&self, their_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn handle_channel_reestablish(&self, their_node_id: &PublicKey, msg: &msgs::ChannelReestablish) {
-		DummyChannelHandler::push_error(self, their_node_id, msg.channel_id);
+		ErroringMessageHandler::push_error(self, their_node_id, msg.channel_id);
 	}
 	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
 	fn peer_connected(&self, _their_node_id: &PublicKey, _msg: &msgs::Init) {}
 	fn handle_error(&self, _their_node_id: &PublicKey, _msg: &msgs::ErrorMessage) {}
 }
-impl Deref for DummyChannelHandler {
-	type Target = DummyChannelHandler;
+impl Deref for ErroringMessageHandler {
+	type Target = ErroringMessageHandler;
 	fn deref(&self) -> &Self { self }
 }
 
@@ -156,10 +156,10 @@ pub struct MessageHandler<CM: Deref, RM: Deref> where
 		CM::Target: ChannelMessageHandler,
 		RM::Target: RoutingMessageHandler {
 	/// A message handler which handles messages specific to channels. Usually this is just a
-	/// ChannelManager object or a DummyChannelHandler.
+	/// ChannelManager object or a ErroringMessageHandler.
 	pub chan_handler: CM,
 	/// A message handler which handles messages updating our knowledge of the network channel
-	/// graph. Usually this is just a NetGraphMsgHandlerMonitor object or a DummyRouteHandler.
+	/// graph. Usually this is just a NetGraphMsgHandlerMonitor object or an IgnoringMessageHandler.
 	pub route_handler: RM,
 }