Return request_id from request_opening_params

.. and expose it via the corresponding event. This allows the client to
track which previously-made request an event corresponds to.

Author: tnull

src/lsps2/client.rs

@@ -155,8 +155,12 @@ where
 	/// `token` is an optional `String` that will be provided to the LSP.
 	/// It can be used by the LSP as an API key, coupon code, or some other way to identify a user.
 	///
+	/// Returns the used [`RequestId`], which will be returned via [`OpeningParametersReady`].
+	///
 	/// [`OpeningParametersReady`]: crate::lsps2::event::LSPS2ClientEvent::OpeningParametersReady
-	pub fn request_opening_params(&self, counterparty_node_id: PublicKey, token: Option<String>) {
+	pub fn request_opening_params(
+		&self, counterparty_node_id: PublicKey, token: Option<String>,
+	) -> RequestId {
 		let request_id = crate::utils::generate_request_id(&self.entropy_source);
 
 		{
@@ -170,9 +174,14 @@ where
 
 		self.pending_messages.enqueue(
 			&counterparty_node_id,
-			LSPS2Message::Request(request_id, LSPS2Request::GetInfo(GetInfoRequest { token }))
-				.into(),
+			LSPS2Message::Request(
+				request_id.clone(),
+				LSPS2Request::GetInfo(GetInfoRequest { token }),
+			)
+			.into(),
 		);
+
+		request_id
 	}
 
 	/// Confirms a set of chosen channel opening parameters to use for the JIT channel and
@@ -249,6 +258,7 @@ where
 
 				self.pending_events.enqueue(Event::LSPS2Client(
 					LSPS2ClientEvent::OpeningParametersReady {
+						request_id,
 						counterparty_node_id: *counterparty_node_id,
 						opening_fee_params_menu: result.opening_fee_params_menu,
 						min_payment_size_msat: result.min_payment_size_msat,

src/lsps2/event.rs

@@ -25,6 +25,13 @@ pub enum LSPS2ClientEvent {
 	///
 	/// [`LSPS2ClientHandler::select_opening_params`]: crate::lsps2::client::LSPS2ClientHandler::select_opening_params
 	OpeningParametersReady {
+		/// The identifier of the issued LSPS2 `get_info` request, as returned by
+		/// [`LSPS2ClientHandler::request_opening_params`]
+		///
+		/// This can be used to track which request this event corresponds to.
+		///
+		/// [`LSPS2ClientHandler::request_opening_params`]: crate::lsps2::client::LSPS2ClientHandler::request_opening_params
+		request_id: RequestId,
 		/// The node id of the LSP that provided this response.
 		counterparty_node_id: PublicKey,
 		/// The menu of fee parameters the LSP is offering at this time.