Move LSPSXClientConfig to liquidity

.. for consistency, as we're about to add `LSPS2ServiceConfig` there,
too.

Author: tnull

src/builder.rs

@@ -18,7 +18,7 @@ use crate::gossip::GossipSource;
 use crate::io::sqlite_store::SqliteStore;
 use crate::io::utils::{read_node_metrics, write_node_metrics};
 use crate::io::vss_store::VssStore;
-use crate::liquidity::LiquiditySourceBuilder;
+use crate::liquidity::{LSPS1ClientConfig, LSPS2ClientConfig, LiquiditySourceBuilder};
 use crate::logger::{log_error, log_info, LdkLogger, LogLevel, LogWriter, Logger};
 use crate::message_handler::NodeCustomMessageHandler;
 use crate::payment::store::PaymentStore;
@@ -105,20 +105,6 @@ struct LiquiditySourceConfig {
 	lsps2_client: Option<LSPS2ClientConfig>,
 }
 
-#[derive(Debug, Clone)]
-struct LSPS1ClientConfig {
-	node_id: PublicKey,
-	address: SocketAddress,
-	token: Option<String>,
-}
-
-#[derive(Debug, Clone)]
-struct LSPS2ClientConfig {
-	node_id: PublicKey,
-	address: SocketAddress,
-	token: Option<String>,
-}
-
 #[derive(Clone)]
 enum LogWriterConfig {
 	File { log_file_path: Option<String>, max_log_level: Option<LogLevel> },

src/liquidity.rs

@@ -52,6 +52,13 @@ struct LSPS1Client {
 		Mutex<HashMap<RequestId, oneshot::Sender<LSPS1OrderStatus>>>,
 }
 
+#[derive(Debug, Clone)]
+pub(crate) struct LSPS1ClientConfig {
+	pub node_id: PublicKey,
+	pub address: SocketAddress,
+	pub token: Option<String>,
+}
+
 struct LSPS2Client {
 	lsp_node_id: PublicKey,
 	lsp_address: SocketAddress,
@@ -61,6 +68,13 @@ struct LSPS2Client {
 	pending_buy_requests: Mutex<HashMap<RequestId, oneshot::Sender<LSPS2BuyResponse>>>,
 }
 
+#[derive(Debug, Clone)]
+pub(crate) struct LSPS2ClientConfig {
+	pub node_id: PublicKey,
+	pub address: SocketAddress,
+	pub token: Option<String>,
+}
+
 pub(crate) struct LiquiditySourceBuilder<L: Deref>
 where
 	L::Target: LdkLogger,