Add internal_connect_open_channel

  Split the current `connect_open_channel` into two separate functions
  to utilise the code in future channel opening functions.

  More precisly, this is to use `internal_connect_open_channel` in a
  future commit by new `payjoin_connect_open_channel` function.

Author: jbesraa

src/lib.rs

@@ -944,21 +944,6 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 			return Err(Error::InsufficientFunds);
 		}
 
-		let peer_info = PeerInfo { node_id, address };
-
-		let con_node_id = peer_info.node_id;
-		let con_addr = peer_info.address.clone();
-		let con_logger = Arc::clone(&self.logger);
-		let con_pm = Arc::clone(&self.peer_manager);
-
-		// We need to use our main runtime here as a local runtime might not be around to poll
-		// connection futures going forward.
-		tokio::task::block_in_place(move || {
-			runtime.block_on(async move {
-				connect_peer_if_necessary(con_node_id, con_addr, con_pm, con_logger).await
-			})
-		})?;
-
 		let channel_config = (*(channel_config.unwrap_or_default())).clone().into();
 		let user_config = UserConfig {
 			channel_handshake_limits: Default::default(),
@@ -972,14 +957,41 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 
 		let push_msat = push_to_counterparty_msat.unwrap_or(0);
 		let user_channel_id: u128 = rand::thread_rng().gen::<u128>();
+		self.internal_connect_open_channel(
+			node_id,
+			channel_amount_sats,
+			push_msat,
+			user_channel_id,
+			address,
+			Some(user_config),
+			runtime,
+		)
+	}
+
+	fn internal_connect_open_channel(
+		&self, node_id: PublicKey, channel_amount_sats: u64, push_msat: u64, user_channel_id: u128,
+		address: SocketAddress, user_config: Option<UserConfig>, runtime: &tokio::runtime::Runtime,
+	) -> Result<UserChannelId, Error> {
+		let peer_info = PeerInfo { node_id, address };
+		let con_node_id = peer_info.node_id;
+		let con_addr = peer_info.address.clone();
+		let con_logger = Arc::clone(&self.logger);
+		let con_pm = Arc::clone(&self.peer_manager);
+		// We need to use our main runtime here as a local runtime might not be around to poll
+		// connection futures going forward.
+		tokio::task::block_in_place(move || {
+			runtime.block_on(async move {
+				connect_peer_if_necessary(con_node_id, con_addr, con_pm, con_logger).await
+			})
+		})?;
 
 		match self.channel_manager.create_channel(
 			peer_info.node_id,
 			channel_amount_sats,
 			push_msat,
 			user_channel_id,
 			None,
-			Some(user_config),
+			user_config,
 		) {
 			Ok(_) => {
 				log_info!(