Prefix BLIP-50/LSPS0 message types to avoid naming collisions

Author: tnull

lightning-liquidity/src/lsps0/client.rs

@@ -7,7 +7,8 @@
 use crate::events::EventQueue;
 use crate::lsps0::event::LSPS0ClientEvent;
 use crate::lsps0::msgs::{
-	LSPS0Message, LSPS0Request, LSPS0Response, ListProtocolsRequest, ListProtocolsResponse,
+	LSPS0ListProtocolsRequest, LSPS0ListProtocolsResponse, LSPS0Message, LSPS0Request,
+	LSPS0Response,
 };
 use crate::lsps0::ser::{ProtocolMessageHandler, ResponseError};
 use crate::message_queue::MessageQueue;
@@ -51,7 +52,7 @@ where
 	pub fn list_protocols(&self, counterparty_node_id: &PublicKey) {
 		let msg = LSPS0Message::Request(
 			utils::generate_request_id(&self.entropy_source),
-			LSPS0Request::ListProtocols(ListProtocolsRequest {}),
+			LSPS0Request::ListProtocols(LSPS0ListProtocolsRequest {}),
 		);
 
 		self.pending_messages.enqueue(counterparty_node_id, msg.into());
@@ -61,7 +62,7 @@ where
 		&self, response: LSPS0Response, counterparty_node_id: &PublicKey,
 	) -> Result<(), LightningError> {
 		match response {
-			LSPS0Response::ListProtocols(ListProtocolsResponse { protocols }) => {
+			LSPS0Response::ListProtocols(LSPS0ListProtocolsResponse { protocols }) => {
 				self.pending_events.enqueue(LSPS0ClientEvent::ListProtocolsResponse {
 					counterparty_node_id: *counterparty_node_id,
 					protocols,
@@ -146,7 +147,7 @@ mod tests {
 			*message,
 			LSPSMessage::LSPS0(LSPS0Message::Request(
 				RequestId("00000000000000000000000000000000".to_string()),
-				LSPS0Request::ListProtocols(ListProtocolsRequest {})
+				LSPS0Request::ListProtocols(LSPS0ListProtocolsRequest {})
 			))
 		);
 	}

lightning-liquidity/src/lsps0/msgs.rs

@@ -15,15 +15,15 @@ pub(crate) const LSPS0_LISTPROTOCOLS_METHOD_NAME: &str = "lsps0.list_protocols";
 /// specification](https://github.com/lightning/blips/blob/master/blip-0050.md#lsps-specification-support-query)
 /// for more information.
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
-pub struct ListProtocolsRequest {}
+pub struct LSPS0ListProtocolsRequest {}
 
 /// A response to a `list_protocols` request.
 ///
 /// Please refer to the [bLIP-50 / LSPS0
 /// specification](https://github.com/lightning/blips/blob/master/blip-0050.md#lsps-specification-support-query)
 /// for more information.
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
-pub struct ListProtocolsResponse {
+pub struct LSPS0ListProtocolsResponse {
 	/// A list of supported protocols.
 	pub protocols: Vec<u16>,
 }
@@ -36,7 +36,7 @@ pub struct ListProtocolsResponse {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum LSPS0Request {
 	/// A request calling `list_protocols`.
-	ListProtocols(ListProtocolsRequest),
+	ListProtocols(LSPS0ListProtocolsRequest),
 }
 
 impl LSPS0Request {
@@ -56,7 +56,7 @@ impl LSPS0Request {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum LSPS0Response {
 	/// A response to a `list_protocols` request.
-	ListProtocols(ListProtocolsResponse),
+	ListProtocols(LSPS0ListProtocolsResponse),
 	/// An error response to a `list_protocols` request.
 	ListProtocolsError(ResponseError),
 }
@@ -118,7 +118,7 @@ mod tests {
 			msg,
 			LSPSMessage::LSPS0(LSPS0Message::Request(
 				RequestId("request:id:xyz123".to_string()),
-				LSPS0Request::ListProtocols(ListProtocolsRequest {})
+				LSPS0Request::ListProtocols(LSPS0ListProtocolsRequest {})
 			))
 		);
 	}
@@ -127,7 +127,7 @@ mod tests {
 	fn serializes_request() {
 		let request = LSPSMessage::LSPS0(LSPS0Message::Request(
 			RequestId("request:id:xyz123".to_string()),
-			LSPS0Request::ListProtocols(ListProtocolsRequest {}),
+			LSPS0Request::ListProtocols(LSPS0ListProtocolsRequest {}),
 		));
 		let json = serde_json::to_string(&request).unwrap();
 		assert_eq!(
@@ -156,7 +156,9 @@ mod tests {
 			response,
 			LSPSMessage::LSPS0(LSPS0Message::Response(
 				RequestId("request:id:xyz123".to_string()),
-				LSPS0Response::ListProtocols(ListProtocolsResponse { protocols: vec![1, 2, 3] })
+				LSPS0Response::ListProtocols(LSPS0ListProtocolsResponse {
+					protocols: vec![1, 2, 3]
+				})
 			))
 		);
 	}
@@ -212,7 +214,7 @@ mod tests {
 	fn serializes_response() {
 		let response = LSPSMessage::LSPS0(LSPS0Message::Response(
 			RequestId("request:id:xyz123".to_string()),
-			LSPS0Response::ListProtocols(ListProtocolsResponse { protocols: vec![1, 2, 3] }),
+			LSPS0Response::ListProtocols(LSPS0ListProtocolsResponse { protocols: vec![1, 2, 3] }),
 		));
 		let json = serde_json::to_string(&response).unwrap();
 		assert_eq!(

lightning-liquidity/src/lsps0/ser.rs

@@ -5,7 +5,7 @@
 //! information.
 
 use crate::lsps0::msgs::{
-	LSPS0Message, LSPS0Request, LSPS0Response, ListProtocolsRequest,
+	LSPS0ListProtocolsRequest, LSPS0Message, LSPS0Request, LSPS0Response,
 	LSPS0_LISTPROTOCOLS_METHOD_NAME,
 };
 
@@ -428,7 +428,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
 			Some(method) => match method {
 				LSPSMethod::LSPS0ListProtocols => Ok(LSPSMessage::LSPS0(LSPS0Message::Request(
 					id,
-					LSPS0Request::ListProtocols(ListProtocolsRequest {}),
+					LSPS0Request::ListProtocols(LSPS0ListProtocolsRequest {}),
 				))),
 				LSPSMethod::LSPS1GetInfo => {
 					let request = serde_json::from_value(params.unwrap_or(json!({})))

lightning-liquidity/src/lsps0/service.rs

@@ -13,7 +13,7 @@
 //! specifcation](https://github.com/lightning/blips/blob/master/blip-0050.md) for more
 //! information.
 
-use crate::lsps0::msgs::{LSPS0Message, LSPS0Request, LSPS0Response, ListProtocolsResponse};
+use crate::lsps0::msgs::{LSPS0ListProtocolsResponse, LSPS0Message, LSPS0Request, LSPS0Response};
 use crate::lsps0::ser::{ProtocolMessageHandler, RequestId};
 use crate::message_queue::MessageQueue;
 use crate::prelude::Vec;
@@ -43,7 +43,7 @@ impl LSPS0ServiceHandler {
 			LSPS0Request::ListProtocols(_) => {
 				let msg = LSPS0Message::Response(
 					request_id,
-					LSPS0Response::ListProtocols(ListProtocolsResponse {
+					LSPS0Response::ListProtocols(LSPS0ListProtocolsResponse {
 						protocols: self.protocols.clone(),
 					}),
 				);
@@ -79,7 +79,7 @@ impl ProtocolMessageHandler for LSPS0ServiceHandler {
 #[cfg(test)]
 mod tests {
 
-	use crate::lsps0::msgs::ListProtocolsRequest;
+	use crate::lsps0::msgs::LSPS0ListProtocolsRequest;
 	use crate::lsps0::ser::LSPSMessage;
 	use crate::tests::utils;
 	use alloc::string::ToString;
@@ -96,7 +96,7 @@ mod tests {
 
 		let list_protocols_request = LSPS0Message::Request(
 			RequestId("xyz123".to_string()),
-			LSPS0Request::ListProtocols(ListProtocolsRequest {}),
+			LSPS0Request::ListProtocols(LSPS0ListProtocolsRequest {}),
 		);
 		let counterparty_node_id = utils::parse_pubkey(
 			"027100442c3b79f606f80f322d98d499eefcb060599efc5d4ecb00209c2cb54190",
@@ -115,7 +115,7 @@ mod tests {
 			*message,
 			LSPSMessage::LSPS0(LSPS0Message::Response(
 				RequestId("xyz123".to_string()),
-				LSPS0Response::ListProtocols(ListProtocolsResponse { protocols: vec![] })
+				LSPS0Response::ListProtocols(LSPS0ListProtocolsResponse { protocols: vec![] })
 			))
 		);
 	}