mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 21:35:11 +01:00
Code Issues Projects Releases Wiki Activity

fix: Only add cli_args if we have some defined

Browse Source 
This was causing calls to `bitcoin-cli` to fail on mainnet since it
was interpreting the empty string as the RPC method to call.
This commit is contained in:
Christian Decker 2017-08-12 15:28:37 +02:00 committed by Rusty Russell
parent f802e98e73
commit f085a474b2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin/chainparams.c
View File

@ -13,7 +13,7 @@ const struct chainparams networks[] = {
0x0a, 0x8c, 0xe2, 0x6f}}},
.rpc_port = 8332,
.cli = "bitcoin-cli",
.cli_args = "",
.cli_args = NULL,
.dust_limit = 546,
.testnet = false},
{.index = 1,

7
daemon/bitcoind.c
View File

@ -28,10 +28,13 @@ static char **gather_args(struct bitcoind *bitcoind,
const tal_t *ctx, const char *cmd, va_list ap)
{
size_t n = 0;
char **args = tal_arr(ctx, char *, 3);
char **args = tal_arr(ctx, char *, 2);
args[n++] = cast_const(char *, bitcoind->chainparams->cli);
args[n++] = cast_const(char *, bitcoind->chainparams->cli_args);
if (bitcoind->chainparams->cli_args) {
args[n++] = cast_const(char *, bitcoind->chainparams->cli_args);
tal_resize(&args, n + 1);
}
if (bitcoind->datadir) {
args[n++] = tal_fmt(args, "-datadir=%s", bitcoind->datadir);