f - remove ResponseErrorHandler

Author: jkczyz

fuzz/src/onion_message.rs

@@ -11,7 +11,7 @@ use lightning::ln::script::ShutdownScript;
 use lightning::util::enforcing_trait_impls::EnforcingSigner;
 use lightning::util::logger::Logger;
 use lightning::util::ser::{Readable, Writeable, Writer};
-use lightning::onion_message::{CustomOnionMessageContents, CustomOnionMessageHandler, Destination, MessageRouter, OffersMessage, OffersMessageHandler, OnionMessagePath, OnionMessenger, ResponseError, ResponseErrorHandler};
+use lightning::onion_message::{CustomOnionMessageContents, CustomOnionMessageHandler, Destination, MessageRouter, OffersMessage, OffersMessageHandler, OnionMessagePath, OnionMessenger};
 
 use crate::utils::test_logger;
 
@@ -73,12 +73,6 @@ impl OffersMessageHandler for TestOffersMessageHandler {
 	}
 }
 
-impl ResponseErrorHandler for TestOffersMessageHandler {
-	fn handle_response_error(&self, _error: ResponseError) {
-		unreachable!()
-	}
-}
-
 struct TestCustomMessage {}
 
 const CUSTOM_MESSAGE_TYPE: u64 = 4242;
@@ -110,12 +104,6 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
 	}
 }
 
-impl ResponseErrorHandler for TestCustomMessageHandler {
-	fn handle_response_error(&self, _error: ResponseError) {
-		unreachable!()
-	}
-}
-
 pub struct VecWriter(pub Vec<u8>);
 impl Writer for VecWriter {
 	fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {

lightning/src/ln/peer_handler.rs

@@ -27,7 +27,7 @@ use crate::util::ser::{VecWriter, Writeable, Writer};
 use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
 use crate::ln::wire;
 use crate::ln::wire::{Encode, Type};
-use crate::onion_message::{CustomOnionMessageContents, CustomOnionMessageHandler, OffersMessage, OffersMessageHandler, ResponseError, ResponseErrorHandler, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
+use crate::onion_message::{CustomOnionMessageContents, CustomOnionMessageHandler, OffersMessage, OffersMessageHandler, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
 use crate::routing::gossip::{NetworkGraph, P2PGossipSync, NodeId, NodeAlias};
 use crate::util::atomic_counter::AtomicCounter;
 use crate::util::logger::Logger;
@@ -129,12 +129,6 @@ impl CustomOnionMessageHandler for IgnoringMessageHandler {
 		Ok(None)
 	}
 }
-impl ResponseErrorHandler for IgnoringMessageHandler {
-	fn handle_response_error(&self, _error: ResponseError) {
-		// Since handler implementations return None for a response.
-		unreachable!();
-	}
-}
 
 impl CustomOnionMessageContents for Infallible {
 	fn tlv_type(&self) -> u64 { unreachable!(); }

lightning/src/onion_message/functional_tests.rs

@@ -13,7 +13,7 @@ use crate::blinded_path::BlindedPath;
 use crate::sign::{NodeSigner, Recipient};
 use crate::ln::features::InitFeatures;
 use crate::ln::msgs::{self, DecodeError, OnionMessageHandler};
-use super::{CustomOnionMessageContents, CustomOnionMessageHandler, Destination, MessageRouter, OffersMessage, OffersMessageHandler, OnionMessageContents, OnionMessagePath, OnionMessenger, ResponseError, ResponseErrorHandler, SendError};
+use super::{CustomOnionMessageContents, CustomOnionMessageHandler, Destination, MessageRouter, OffersMessage, OffersMessageHandler, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError};
 use crate::util::ser::{Writeable, Writer};
 use crate::util::test_utils;
 
@@ -63,12 +63,6 @@ impl OffersMessageHandler for TestOffersMessageHandler {
 	}
 }
 
-impl ResponseErrorHandler for TestOffersMessageHandler {
-	fn handle_response_error(&self, _error: ResponseError) {
-		todo!()
-	}
-}
-
 #[derive(Clone)]
 struct TestCustomMessage {}
 
@@ -124,12 +118,6 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
 	}
 }
 
-impl ResponseErrorHandler for TestCustomMessageHandler {
-	fn handle_response_error(&self, _error: ResponseError) {
-		todo!()
-	}
-}
-
 fn create_nodes(num_messengers: u8) -> Vec<MessengerNode> {
 	let mut nodes = Vec::new();
 	for i in 0..num_messengers {

lightning/src/onion_message/messenger.rs

@@ -220,7 +220,7 @@ pub enum SendError {
 ///
 /// [`IgnoringMessageHandler`]: crate::ln::peer_handler::IgnoringMessageHandler
 /// [`CustomMessage`]: Self::CustomMessage
-pub trait CustomOnionMessageHandler: ResponseErrorHandler {
+pub trait CustomOnionMessageHandler {
 	/// The message known to the handler. To support multiple message types, you may want to make this
 	/// an enum with a variant for each supported message.
 	type CustomMessage: CustomOnionMessageContents;
@@ -233,28 +233,6 @@ pub trait CustomOnionMessageHandler: ResponseErrorHandler {
 	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
 }
 
-/// Handler for errors occurring when responding to an onion message.
-///
-/// Each message handler may choose to reply to an onion message with a response. This handler is
-/// used when an error occurs when responding.
-pub trait ResponseErrorHandler {
-	/// Called if an error occurred when sending a response to the handled message.
-	fn handle_response_error(&self, error: ResponseError);
-}
-
-/// An error when replying to an onion message.
-#[derive(Debug, PartialEq, Eq)]
-pub enum ResponseError {
-	/// Failed to get the node id from the [`NodeSigner`].
-	GetNodeIdFailed,
-	/// No reply path in the onion message.
-	NoReplyPath,
-	/// Could not find a path to the destination.
-	PathNotFound,
-	/// Failed to send the reply.
-	Sending(SendError),
-}
-
 impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
 OnionMessenger<ES, NS, L, MR, OMH, CMH>
 where
@@ -344,9 +322,9 @@ where
 		}
 	}
 
-	fn respond_with_onion_message<T: CustomOnionMessageContents, EH: ResponseErrorHandler>(
+	fn respond_with_onion_message<T: CustomOnionMessageContents>(
 		&self, response: OnionMessageContents<T>, path_id: Option<[u8; 32]>,
-		reply_path: Option<BlindedPath>, error_handler: &EH
+		reply_path: Option<BlindedPath>
 	) {
 		let sender = match self.node_signer.get_node_id(Recipient::Node) {
 			Ok(node_id) => node_id,
@@ -355,7 +333,7 @@ where
 					self.logger, "No sender to respond to onion message with path_id {:02x?}",
 					path_id
 				);
-				return error_handler.handle_response_error(ResponseError::GetNodeIdFailed);
+				return;
 			}
 		};
 
@@ -368,7 +346,7 @@ where
 					self.logger, "No reply path to respond to onion message with path_id {:02x?}",
 					path_id
 				);
-				return error_handler.handle_response_error(ResponseError::NoReplyPath);
+				return;
 			},
 		};
 
@@ -379,7 +357,7 @@ where
 					self.logger, "No path to respond to onion message with path_id {:02x?}",
 					path_id
 				);
-				return error_handler.handle_response_error(ResponseError::PathNotFound);
+				return;
 			},
 		};
 
@@ -390,7 +368,7 @@ where
 				self.logger, "Failed responding to onion message with path_id {:02x?}: {:?}",
 				path_id, e
 			);
-			return error_handler.handle_response_error(ResponseError::Sending(e));
+			return;
 		}
 	}
 
@@ -490,14 +468,7 @@ where
 				};
 
 				if let Some(response) = response {
-					match response {
-						OnionMessageContents::Offers(_) => self.respond_with_onion_message(
-							response, path_id, reply_path, &*self.offers_handler
-						),
-						OnionMessageContents::Custom(_) => self.respond_with_onion_message(
-							response, path_id, reply_path, &*self.custom_handler
-						),
-					}
+					self.respond_with_onion_message(response, path_id, reply_path);
 				}
 			},
 			Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {

lightning/src/onion_message/mod.rs

@@ -27,6 +27,6 @@ mod packet;
 mod functional_tests;
 
 // Re-export structs so they can be imported with just the `onion_message::` module prefix.
-pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, ResponseError, ResponseErrorHandler, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
+pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
 pub use self::offers::{OffersMessage, OffersMessageHandler};
 pub(crate) use self::packet::{ControlTlvs, Packet};

lightning/src/onion_message/offers.rs

@@ -16,7 +16,6 @@ use crate::offers::invoice_error::InvoiceError;
 use crate::offers::invoice_request::InvoiceRequest;
 use crate::offers::invoice::Invoice;
 use crate::offers::parse::ParseError;
-use crate::onion_message::messenger::ResponseErrorHandler;
 use crate::util::logger::Logger;
 use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 
@@ -30,7 +29,7 @@ const INVOICE_ERROR_TLV_TYPE: u64 = 68;
 /// A handler for an [`OnionMessage`] containing a BOLT 12 Offers message as its payload.
 ///
 /// [`OnionMessage`]: crate::ln::msgs::OnionMessage
-pub trait OffersMessageHandler: ResponseErrorHandler {
+pub trait OffersMessageHandler {
 	/// Handles the given message by either responding with an [`Invoice`], sending a payment, or
 	/// replying with an error.
 	fn handle_message(&self, message: OffersMessage) -> Option<OffersMessage>;