aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitcoind: don't use double in extracting feerate.

Browse Source 
It introduces imprecision (took 1 satoshi off results in the coming
tests), and we have a helper for this already.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-22 10:58:49 +09:30
committed by Christian Decker
parent 2314a4aa5d
commit 3d8836c1e5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lightningd/bitcoind.c
View File

@@ -280,7 +280,7 @@ start_bitcoin_cli(struct bitcoind *bitcoind,
static bool extract_feerate(struct bitcoin_cli *bcli, static bool extract_feerate(struct bitcoin_cli *bcli,
const char *output, size_t output_bytes, const char *output, size_t output_bytes,
double *feerate) u64 *feerate)
{ {
const jsmntok_t *tokens, *feeratetok; const jsmntok_t *tokens, *feeratetok;
bool valid; bool valid;
@@ -303,7 +303,7 @@ static bool extract_feerate(struct bitcoin_cli *bcli,
if (!feeratetok) if (!feeratetok)
return false; return false;
return json_to_double(output, feeratetok, feerate); return json_tok_bitcoin_amount(output, feeratetok, feerate);
} }
struct estimatefee { struct estimatefee {
@@ -322,7 +322,7 @@ static void do_one_estimatefee(struct bitcoind *bitcoind,
static bool process_estimatefee(struct bitcoin_cli *bcli) static bool process_estimatefee(struct bitcoin_cli *bcli)
{ {
double feerate; u64 feerate;
struct estimatefee *efee = bcli->cb_arg; struct estimatefee *efee = bcli->cb_arg;
/* FIXME: We could trawl recent blocks for median fee... */ /* FIXME: We could trawl recent blocks for median fee... */
@@ -332,7 +332,7 @@ static bool process_estimatefee(struct bitcoin_cli *bcli)
efee->satoshi_per_kw[efee->i] = 0; efee->satoshi_per_kw[efee->i] = 0;
} else } else
/* Rate in satoshi per kw. */ /* Rate in satoshi per kw. */
efee->satoshi_per_kw[efee->i] = feerate * 100000000 / 4; efee->satoshi_per_kw[efee->i] = feerate / 4;
efee->i++; efee->i++;
if (efee->i == tal_count(efee->satoshi_per_kw)) { if (efee->i == tal_count(efee->satoshi_per_kw)) {