Add CLI and env var config support, split bitcoind_rpc_addr into host/port
#69
Conversation
- Added `clap` dependency to `ldk-server` to support passing essential node config via CLI arguments and environment variables. - Implemented layered config loading: config file (full set of options) + environment variables + CLI arguments. Env vars and CLI args override values from the config file when present. - Split `bitcoind_rpc_addr` into `bitcoind_rpc_host` and `bitcoind_rpc_port` for clearer configuration. - Added tests for the new config loading logic. - Updated README with usage instructions and explanation of config precedence.
|
I've assigned @jkczyz as a reviewer! |
|
Thank you for your work on this! I'm still going through the changes, but I have an early high-level question. Is there a reason or trade-off why the My initial thought was that a crate like Just want to make sure I understand the design decision. |
|
I chose to use I hadn’t considered using a separate configuration crate like |
|
🔔 1st Reminder Hey @jkczyz! This PR has been waiting for your review. |
|
🔔 2nd Reminder Hey @jkczyz! This PR has been waiting for your review. |
| None | ||
| }; | ||
|
|
||
| macro_rules! pick { |
There was a problem hiding this comment.
TBH, the call sites may be more readable if everything was explicitly written out. There isn't much happening here, so I don't think it would be too verbose.
| rpc_address: String, | ||
| rpc_user: String, | ||
| rpc_password: String, | ||
| rpc_host: Option<String>, | ||
| rpc_port: Option<u16>, | ||
| rpc_user: Option<String>, | ||
| rpc_password: Option<String>, |
There was a problem hiding this comment.
Could you make a separate commit for splitting the RPC address?
|
|
||
| macro_rules! pick { | ||
| ($cli:expr, $toml:expr, $err_msg:expr) => { | ||
| $cli.or($toml).ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, $err_msg)) |
| }; | ||
| } | ||
|
|
||
| fn missing_field_msg(field: &str) -> String { |
There was a problem hiding this comment.
Could this return the io::Error instead? Then the unrolled macro would be less verbose.
Added support for configuring the node via CLI arguments and environment variables, using
clap(as already done inldk-server-cli).Configuration is now loaded from three sources:
Environment variables and CLI arguments override values defined in the config file when provided.
In addition, the
bitcoind_rpc_addrfield was split into two variables for better clarity:bitcoind_rpc_hostbitcoind_rpc_portTests were added for the new configuration loading logic, and the README was updated with usage instructions.
close #42 and #66