Prefix BLIP-51/LSPS1 message types to avoid naming collisions

Author: tnull

lightning-liquidity/src/lsps1/client.rs

@@ -11,8 +11,9 @@
 
 use super::event::LSPS1ClientEvent;
 use super::msgs::{
-	CreateOrderRequest, CreateOrderResponse, GetInfoRequest, GetInfoResponse, GetOrderRequest,
-	LSPS1Message, LSPS1Request, LSPS1Response, OrderId, OrderParameters,
+	LSPS1CreateOrderRequest, LSPS1CreateOrderResponse, LSPS1GetInfoRequest, LSPS1GetInfoResponse,
+	LSPS1GetOrderRequest, LSPS1Message, LSPS1OrderId, LSPS1OrderParams, LSPS1Request,
+	LSPS1Response,
 };
 use crate::message_queue::MessageQueue;
 
@@ -94,14 +95,15 @@ where
 			peer_state_lock.pending_get_info_requests.insert(request_id.clone());
 		}
 
-		let request = LSPS1Request::GetInfo(GetInfoRequest {});
+		let request = LSPS1Request::GetInfo(LSPS1GetInfoRequest {});
 		let msg = LSPS1Message::Request(request_id.clone(), request).into();
 		self.pending_messages.enqueue(&counterparty_node_id, msg);
 		request_id
 	}
 
 	fn handle_get_info_response(
-		&self, request_id: RequestId, counterparty_node_id: &PublicKey, result: GetInfoResponse,
+		&self, request_id: RequestId, counterparty_node_id: &PublicKey,
+		result: LSPS1GetInfoResponse,
 	) -> Result<(), LightningError> {
 		let outer_state_lock = self.per_peer_state.write().unwrap();
 
@@ -184,7 +186,7 @@ where
 	///
 	/// The client agrees to paying channel fees according to the provided parameters.
 	pub fn create_order(
-		&self, counterparty_node_id: &PublicKey, order: OrderParameters,
+		&self, counterparty_node_id: &PublicKey, order: LSPS1OrderParams,
 		refund_onchain_address: Option<Address>,
 	) -> RequestId {
 		let (request_id, request_msg) = {
@@ -195,8 +197,10 @@ where
 			let mut peer_state_lock = inner_state_lock.lock().unwrap();
 
 			let request_id = crate::utils::generate_request_id(&self.entropy_source);
-			let request =
-				LSPS1Request::CreateOrder(CreateOrderRequest { order, refund_onchain_address });
+			let request = LSPS1Request::CreateOrder(LSPS1CreateOrderRequest {
+				order,
+				refund_onchain_address,
+			});
 			let msg = LSPS1Message::Request(request_id.clone(), request).into();
 			peer_state_lock.pending_create_order_requests.insert(request_id.clone());
 
@@ -212,7 +216,7 @@ where
 
 	fn handle_create_order_response(
 		&self, request_id: RequestId, counterparty_node_id: &PublicKey,
-		response: CreateOrderResponse,
+		response: LSPS1CreateOrderResponse,
 	) -> Result<(), LightningError> {
 		let outer_state_lock = self.per_peer_state.read().unwrap();
 		match outer_state_lock.get(counterparty_node_id) {
@@ -302,7 +306,7 @@ where
 	///
 	/// [`LSPS1ClientEvent::OrderStatus`]: crate::lsps1::event::LSPS1ClientEvent::OrderStatus
 	pub fn check_order_status(
-		&self, counterparty_node_id: &PublicKey, order_id: OrderId,
+		&self, counterparty_node_id: &PublicKey, order_id: LSPS1OrderId,
 	) -> RequestId {
 		let (request_id, request_msg) = {
 			let mut outer_state_lock = self.per_peer_state.write().unwrap();
@@ -314,7 +318,8 @@ where
 			let request_id = crate::utils::generate_request_id(&self.entropy_source);
 			peer_state_lock.pending_get_order_requests.insert(request_id.clone());
 
-			let request = LSPS1Request::GetOrder(GetOrderRequest { order_id: order_id.clone() });
+			let request =
+				LSPS1Request::GetOrder(LSPS1GetOrderRequest { order_id: order_id.clone() });
 			let msg = LSPS1Message::Request(request_id.clone(), request).into();
 
 			(request_id, Some(msg))
@@ -329,7 +334,7 @@ where
 
 	fn handle_get_order_response(
 		&self, request_id: RequestId, counterparty_node_id: &PublicKey,
-		response: CreateOrderResponse,
+		response: LSPS1CreateOrderResponse,
 	) -> Result<(), LightningError> {
 		let outer_state_lock = self.per_peer_state.read().unwrap();
 		match outer_state_lock.get(counterparty_node_id) {

lightning-liquidity/src/lsps1/event.rs

@@ -9,8 +9,8 @@
 
 //! Contains bLIP-51 / LSPS1 event types
 
-use super::msgs::OrderId;
-use super::msgs::{ChannelInfo, LSPS1Options, OrderParameters, PaymentInfo};
+use super::msgs::LSPS1OrderId;
+use super::msgs::{LSPS1ChannelInfo, LSPS1Options, LSPS1OrderParams, LSPS1PaymentInfo};
 
 use crate::lsps0::ser::{RequestId, ResponseError};
 
@@ -78,13 +78,13 @@ pub enum LSPS1ClientEvent {
 		/// The node id of the LSP.
 		counterparty_node_id: PublicKey,
 		/// The id of the channel order.
-		order_id: OrderId,
+		order_id: LSPS1OrderId,
 		/// The order created by client and approved by LSP.
-		order: OrderParameters,
+		order: LSPS1OrderParams,
 		/// The details regarding payment of the order
-		payment: PaymentInfo,
+		payment: LSPS1PaymentInfo,
 		/// The details regarding state of the channel ordered.
-		channel: Option<ChannelInfo>,
+		channel: Option<LSPS1ChannelInfo>,
 	},
 	/// Information from the LSP about the status of a previously created order.
 	///
@@ -102,13 +102,13 @@ pub enum LSPS1ClientEvent {
 		/// The node id of the LSP.
 		counterparty_node_id: PublicKey,
 		/// The id of the channel order.
-		order_id: OrderId,
+		order_id: LSPS1OrderId,
 		/// The order created by client and approved by LSP.
-		order: OrderParameters,
+		order: LSPS1OrderParams,
 		/// The details regarding payment of the order
-		payment: PaymentInfo,
+		payment: LSPS1PaymentInfo,
 		/// The details regarding state of the channel ordered.
-		channel: Option<ChannelInfo>,
+		channel: Option<LSPS1ChannelInfo>,
 	},
 	/// A request previously issued via [`LSPS1ClientHandler::create_order`] or [`LSPS1ClientHandler::check_order_status`].
 	/// failed as the LSP returned an error response.
@@ -151,7 +151,7 @@ pub enum LSPS1ServiceEvent {
 		/// The node id of the client making the information request.
 		counterparty_node_id: PublicKey,
 		/// The order requested by the client.
-		order: OrderParameters,
+		order: LSPS1OrderParams,
 	},
 	/// A request from client to check the status of the payment.
 	///
@@ -169,7 +169,7 @@ pub enum LSPS1ServiceEvent {
 		/// The node id of the client making the information request.
 		counterparty_node_id: PublicKey,
 		/// The order id of order with pending payment.
-		order_id: OrderId,
+		order_id: LSPS1OrderId,
 	},
 	/// If error is encountered, refund the amount if paid by the client.
 	Refund {
@@ -178,6 +178,6 @@ pub enum LSPS1ServiceEvent {
 		/// The node id of the client making the information request.
 		counterparty_node_id: PublicKey,
 		/// The order id of the refunded order.
-		order_id: OrderId,
+		order_id: LSPS1OrderId,
 	},
 }