Reorder LSPS2 API params

.. to align with the rest of the APIs where we usually go `node_id`,
`address`, etc.

Author: tnull

bindings/ldk_node.udl

@@ -39,7 +39,7 @@ interface Builder {
 	void set_chain_source_bitcoind_rpc(string rpc_host, u16 rpc_port, string rpc_user, string rpc_password);
 	void set_gossip_source_p2p();
 	void set_gossip_source_rgs(string rgs_server_url);
-	void set_liquidity_source_lsps2(SocketAddress address, PublicKey node_id, string? token);
+	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
 	void set_storage_dir_path(string storage_dir_path);
 	void set_network(Network network);
 	[Throws=BuildError]

src/builder.rs

@@ -96,8 +96,8 @@ enum GossipSourceConfig {
 
 #[derive(Debug, Clone)]
 struct LiquiditySourceConfig {
-	// LSPS2 service's (address, node_id, token)
-	lsps2_service: Option<(SocketAddress, PublicKey, Option<String>)>,
+	// LSPS2 service's (node_id, address, token)
+	lsps2_service: Option<(PublicKey, SocketAddress, Option<String>)>,
 }
 
 impl Default for LiquiditySourceConfig {
@@ -281,14 +281,14 @@ impl NodeBuilder {
 	///
 	/// The given `token` will be used by the LSP to authenticate the user.
 	pub fn set_liquidity_source_lsps2(
-		&mut self, address: SocketAddress, node_id: PublicKey, token: Option<String>,
+		&mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 	) -> &mut Self {
 		// Mark the LSP as trusted for 0conf
 		self.config.trusted_peers_0conf.push(node_id.clone());
 
 		let liquidity_source_config =
 			self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
-		liquidity_source_config.lsps2_service = Some((address, node_id, token));
+		liquidity_source_config.lsps2_service = Some((node_id, address, token));
 		self
 	}
 
@@ -600,9 +600,9 @@ impl ArcedNodeBuilder {
 	///
 	/// The given `token` will be used by the LSP to authenticate the user.
 	pub fn set_liquidity_source_lsps2(
-		&self, address: SocketAddress, node_id: PublicKey, token: Option<String>,
+		&self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 	) {
-		self.inner.write().unwrap().set_liquidity_source_lsps2(address, node_id, token);
+		self.inner.write().unwrap().set_liquidity_source_lsps2(node_id, address, token);
 	}
 
 	/// Sets the used storage directory path.
@@ -1053,7 +1053,7 @@ fn build_with_store_internal(
 	};
 
 	let liquidity_source = liquidity_source_config.as_ref().and_then(|lsc| {
-		lsc.lsps2_service.as_ref().map(|(address, node_id, token)| {
+		lsc.lsps2_service.as_ref().map(|(node_id, address, token)| {
 			let lsps2_client_config = Some(LSPS2ClientConfig {});
 			let liquidity_client_config = Some(LiquidityClientConfig { lsps2_client_config });
 			let liquidity_manager = Arc::new(LiquidityManager::new(
@@ -1065,8 +1065,8 @@ fn build_with_store_internal(
 				liquidity_client_config,
 			));
 			Arc::new(LiquiditySource::new_lsps2(
-				address.clone(),
 				*node_id,
+				address.clone(),
 				token.clone(),
 				Arc::clone(&channel_manager),
 				Arc::clone(&keys_manager),

src/liquidity.rs

@@ -32,8 +32,8 @@ use std::time::Duration;
 const LIQUIDITY_REQUEST_TIMEOUT_SECS: u64 = 5;
 
 struct LSPS2Service {
-	address: SocketAddress,
 	node_id: PublicKey,
+	address: SocketAddress,
 	token: Option<String>,
 	pending_fee_requests: Mutex<HashMap<RequestId, oneshot::Sender<LSPS2FeeResponse>>>,
 	pending_buy_requests: Mutex<HashMap<RequestId, oneshot::Sender<LSPS2BuyResponse>>>,
@@ -56,15 +56,15 @@ where
 	L::Target: Logger,
 {
 	pub(crate) fn new_lsps2(
-		address: SocketAddress, node_id: PublicKey, token: Option<String>,
+		node_id: PublicKey, address: SocketAddress, token: Option<String>,
 		channel_manager: Arc<ChannelManager>, keys_manager: Arc<KeysManager>,
 		liquidity_manager: Arc<LiquidityManager>, config: Arc<Config>, logger: L,
 	) -> Self {
 		let pending_fee_requests = Mutex::new(HashMap::new());
 		let pending_buy_requests = Mutex::new(HashMap::new());
 		let lsps2_service = Some(LSPS2Service {
-			address,
 			node_id,
+			address,
 			token,
 			pending_fee_requests,
 			pending_buy_requests,