Add e2e coverage for CLI config loading

Exercise the CLI against the server-generated config file so e2e tests
cover client-side parsing of daemon config sections. Rebuild the e2e CLI
binary when the client crate changes so this path cannot use stale code.

Author: benthecarman

e2e-tests/build.rs

@@ -54,6 +54,8 @@ fn main() {
 	println!("cargo:rerun-if-changed=../ldk-server/Cargo.toml");
 	println!("cargo:rerun-if-changed=../ldk-server-cli/src");
 	println!("cargo:rerun-if-changed=../ldk-server-cli/Cargo.toml");
+	println!("cargo:rerun-if-changed=../ldk-server-client/src");
+	println!("cargo:rerun-if-changed=../ldk-server-client/Cargo.toml");
 	println!("cargo:rerun-if-changed=../ldk-server-grpc/src");
 	println!("cargo:rerun-if-changed=../ldk-server-grpc/Cargo.toml");
 	println!("cargo:rerun-if-changed=../ldk-server-mcp/src");

e2e-tests/src/lib.rs

@@ -91,6 +91,7 @@ pub struct LdkServerHandle {
 	pub grpc_port: u16,
 	pub p2p_port: u16,
 	pub storage_dir: PathBuf,
+	pub config_path: PathBuf,
 	pub api_key: String,
 	pub tls_cert_path: PathBuf,
 	pub node_id: String,
@@ -214,6 +215,7 @@ poll_metrics_interval = 1
 			grpc_port,
 			p2p_port,
 			storage_dir,
+			config_path,
 			api_key,
 			tls_cert_path,
 			node_id: String::new(),
@@ -381,13 +383,42 @@ pub fn run_cli_raw(handle: &LdkServerHandle, args: &[&str]) -> String {
 	String::from_utf8(output.stdout).unwrap()
 }
 
+/// Run a CLI command using the server's config file for connection details.
+pub fn run_cli_with_config_raw(handle: &LdkServerHandle, args: &[&str]) -> String {
+	let cli_path = cli_binary_path();
+	let output = Command::new(&cli_path)
+		.arg("--config")
+		.arg(handle.config_path.to_str().unwrap())
+		.args(args)
+		.output()
+		.unwrap_or_else(|e| panic!("Failed to run CLI at {:?}: {}", cli_path, e));
+
+	if !output.status.success() {
+		let stderr = String::from_utf8_lossy(&output.stderr);
+		let stdout = String::from_utf8_lossy(&output.stdout);
+		panic!(
+			"CLI command {:?} failed with status {}\nstdout: {}\nstderr: {}",
+			args, output.status, stdout, stderr
+		);
+	}
+
+	String::from_utf8(output.stdout).unwrap()
+}
+
 /// Run a CLI command against the given server handle and return parsed JSON output.
 pub fn run_cli(handle: &LdkServerHandle, args: &[&str]) -> serde_json::Value {
 	let stdout = run_cli_raw(handle, args);
 	serde_json::from_str(&stdout)
 		.unwrap_or_else(|e| panic!("Failed to parse CLI output as JSON: {e}\nOutput: {stdout}"))
 }
 
+/// Run a CLI command using the server's config file and return parsed JSON output.
+pub fn run_cli_with_config(handle: &LdkServerHandle, args: &[&str]) -> serde_json::Value {
+	let stdout = run_cli_with_config_raw(handle, args);
+	serde_json::from_str(&stdout)
+		.unwrap_or_else(|e| panic!("Failed to parse CLI output as JSON: {e}\nOutput: {stdout}"))
+}
+
 /// Mine blocks and wait for all servers to sync to the new chain tip.
 pub async fn mine_and_sync(
 	bitcoind: &TestBitcoind, servers: &[&LdkServerHandle], block_count: u64,

e2e-tests/tests/e2e.rs

@@ -11,9 +11,9 @@ use std::str::FromStr;
 use std::time::Duration;
 
 use e2e_tests::{
-	find_available_port, mine_and_sync, run_cli, run_cli_raw, setup_funded_channel,
-	wait_for_onchain_balance, wait_for_usable_channel, LdkServerConfig, LdkServerHandle,
-	TestBitcoind,
+	find_available_port, mine_and_sync, run_cli, run_cli_raw, run_cli_with_config,
+	setup_funded_channel, wait_for_onchain_balance, wait_for_usable_channel, LdkServerConfig,
+	LdkServerHandle, TestBitcoind,
 };
 use hex_conservative::{DisplayHex, FromHex};
 use ldk_node::bitcoin::hashes::{sha256, Hash};
@@ -57,6 +57,15 @@ async fn test_cli_get_node_info() {
 	assert_eq!(output["node_id"], server.node_id());
 }
 
+#[tokio::test]
+async fn test_cli_get_node_info_with_server_config() {
+	let bitcoind = TestBitcoind::new();
+	let server = LdkServerHandle::start(&bitcoind).await;
+
+	let output = run_cli_with_config(&server, &["get-node-info"]);
+	assert_eq!(output["node_id"], server.node_id());
+}
+
 #[tokio::test]
 async fn test_cli_onchain_receive() {
 	let bitcoind = TestBitcoind::new();