Rename lightning-liquidity's LSPS2 things to avoid confusion

In general it kinda sucks to export multiple enums/structs as the
same name, event across multiple modules/crates as it could cause
downstream users to have to use overly verbose fully qualified
types.

More importantly, however, we cannot express multiple things under
the same name in bindings (as we ultimately export to C which has
a single, global, namespace).

Here we rename several structs in `lightning-liquidity`'s LSPS2
similar to what we did with LSPS1 structs in the previous commit to
avoid having unprefixed and prefixed structs with the same name in
`lightning-liquidity`.

Author: TheBlueMatt

lightning-liquidity/src/lsps2/client.rs

@@ -26,7 +26,7 @@ use core::default::Default;
 use core::ops::Deref;
 
 use crate::lsps2::msgs::{
-	BuyRequest, BuyResponse, GetInfoRequest, GetInfoResponse, LSPS2Message, LSPS2Request,
+	BuyRequest, BuyResponse, LSPS2GetInfoRequest, LSPS2GetInfoResponse, LSPS2Message, LSPS2Request,
 	LSPS2Response, OpeningFeeParams,
 };
 
@@ -122,7 +122,7 @@ where
 			peer_state_lock.pending_get_info_requests.insert(request_id.clone());
 		}
 
-		let request = LSPS2Request::GetInfo(GetInfoRequest { token });
+		let request = LSPS2Request::GetInfo(LSPS2GetInfoRequest { token });
 		let msg = LSPS2Message::Request(request_id.clone(), request).into();
 		self.pending_messages.enqueue(&counterparty_node_id, msg);
 
@@ -181,7 +181,7 @@ where
 	}
 
 	fn handle_get_info_response(
-		&self, request_id: RequestId, counterparty_node_id: &PublicKey, result: GetInfoResponse,
+		&self, request_id: RequestId, counterparty_node_id: &PublicKey, result: LSPS2GetInfoResponse,
 	) -> Result<(), LightningError> {
 		let outer_state_lock = self.per_peer_state.read().unwrap();
 		match outer_state_lock.get(counterparty_node_id) {

lightning-liquidity/src/lsps2/msgs.rs

@@ -27,7 +27,7 @@ pub(crate) const LSPS2_BUY_REQUEST_PAYMENT_SIZE_TOO_LARGE_ERROR_CODE: i32 = 203;
 
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 /// A request made to an LSP to learn their current channel fees and parameters.
-pub struct GetInfoRequest {
+pub struct LSPS2GetInfoRequest {
 	/// An optional token to provide to the LSP.
 	pub token: Option<String>,
 }
@@ -106,9 +106,9 @@ pub struct OpeningFeeParams {
 	pub promise: String,
 }
 
-/// A response to a [`GetInfoRequest`]
+/// A response to a [`LSPS2GetInfoRequest`]
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
-pub struct GetInfoResponse {
+pub struct LSPS2GetInfoResponse {
 	/// A set of opening fee parameters.
 	pub opening_fee_params_menu: Vec<OpeningFeeParams>,
 }
@@ -164,7 +164,7 @@ pub struct BuyResponse {
 /// An enum that captures all the valid JSON-RPC requests in the LSPS2 protocol.
 pub enum LSPS2Request {
 	/// A request to learn an LSP's channel fees and parameters.
-	GetInfo(GetInfoRequest),
+	GetInfo(LSPS2GetInfoRequest),
 	/// A request to buy a JIT channel from an LSP.
 	Buy(BuyRequest),
 }
@@ -173,7 +173,7 @@ pub enum LSPS2Request {
 /// An enum that captures all the valid JSON-RPC responses in the LSPS2 protocol.
 pub enum LSPS2Response {
 	/// A successful response to a [`LSPS2Request::GetInfo`] request.
-	GetInfo(GetInfoResponse),
+	GetInfo(LSPS2GetInfoResponse),
 	/// An error response to a [`LSPS2Request::GetInfo`] request.
 	GetInfoError(ResponseError),
 	/// A successful response to a [`LSPS2Request::Buy`] request.

lightning-liquidity/src/lsps2/service.rs

@@ -40,7 +40,7 @@ use core::ops::Deref;
 use core::sync::atomic::{AtomicUsize, Ordering};
 
 use crate::lsps2::msgs::{
-	BuyRequest, BuyResponse, GetInfoRequest, GetInfoResponse, LSPS2Message, LSPS2Request,
+	BuyRequest, BuyResponse, LSPS2GetInfoRequest, LSPS2GetInfoResponse, LSPS2Message, LSPS2Request,
 	LSPS2Response, OpeningFeeParams, RawOpeningFeeParams,
 	LSPS2_BUY_REQUEST_INVALID_OPENING_FEE_PARAMS_ERROR_CODE,
 	LSPS2_BUY_REQUEST_PAYMENT_SIZE_TOO_LARGE_ERROR_CODE,
@@ -658,7 +658,7 @@ where
 
 					match self.remove_pending_request(&mut peer_state_lock, &request_id) {
 						Some(LSPS2Request::GetInfo(_)) => {
-							let response = LSPS2Response::GetInfo(GetInfoResponse {
+							let response = LSPS2Response::GetInfo(LSPS2GetInfoResponse {
 								opening_fee_params_menu: opening_fee_params_menu
 									.into_iter()
 									.map(|param| {
@@ -1076,7 +1076,7 @@ where
 	}
 
 	fn handle_get_info_request(
-		&self, request_id: RequestId, counterparty_node_id: &PublicKey, params: GetInfoRequest,
+		&self, request_id: RequestId, counterparty_node_id: &PublicKey, params: LSPS2GetInfoRequest,
 	) -> Result<(), LightningError> {
 		let (result, response) = {
 			let mut outer_state_lock = self.per_peer_state.write().unwrap();