Browse Source

getblockhash: don't get upset if we fail.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 7 years ago
committed by Christian Decker
parent
commit
985a0b431f
  1. 8
      lightningd/bitcoind.c
  2. 1
      lightningd/bitcoind.h

8
lightningd/bitcoind.c

@ -491,6 +491,12 @@ static void process_getblockhash(struct bitcoin_cli *bcli)
const struct bitcoin_blkid *blkid,
void *arg) = bcli->cb;
/* If it failed, call with NULL block. */
if (*bcli->exitstatus != 0) {
cb(bcli->bitcoind, NULL, bcli->cb_arg);
return;
}
if (bcli->output_bytes == 0
|| !bitcoin_blkid_from_hex(bcli->output, bcli->output_bytes-1,
&blkid)) {
@ -511,7 +517,7 @@ void bitcoind_getblockhash_(struct bitcoind *bitcoind,
char str[STR_MAX_CHARS(height)];
sprintf(str, "%u", height);
start_bitcoin_cli(bitcoind, NULL, process_getblockhash, false, cb, arg,
start_bitcoin_cli(bitcoind, NULL, process_getblockhash, true, cb, arg,
"getblockhash", str, NULL);
}

1
lightningd/bitcoind.h

@ -112,6 +112,7 @@ void bitcoind_getblockcount_(struct bitcoind *bitcoind,
u32 blockcount), \
(arg))
/* blkid is NULL if call fails. */
void bitcoind_getblockhash_(struct bitcoind *bitcoind,
u32 height,
void (*cb)(struct bitcoind *bitcoind,

Loading…
Cancel
Save