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

bkpr: don't use a minus in a sql stmt

Browse Source 
Avoid rounding errors in sql by doing it in code.
This commit is contained in:
niftynei
2022-07-19 17:04:38 +09:30
committed by Rusty Russell
parent a45da63280
commit 2b3ef37590
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/bkpr/recorder.c
View File

@@ -223,7 +223,8 @@ struct fee_sum **calculate_onchain_fee_sums(const tal_t *ctx, struct db *db)
", of.account_id" ", of.account_id"
", a.name" ", a.name"
", of.currency" ", of.currency"
", CAST(SUM(of.credit) AS BIGINT) - CAST(SUM(of.debit) AS BIGINT) as fees" ", CAST(SUM(of.credit) AS BIGINT) as credit"
", CAST(SUM(of.debit) AS BIGINT) as debit"
" FROM onchain_fees of" " FROM onchain_fees of"
" LEFT OUTER JOIN accounts a" " LEFT OUTER JOIN accounts a"
" ON of.account_id = a.id" " ON of.account_id = a.id"
@@ -238,6 +239,8 @@ struct fee_sum **calculate_onchain_fee_sums(const tal_t *ctx, struct db *db)
sums = tal_arr(ctx, struct fee_sum *, 0); sums = tal_arr(ctx, struct fee_sum *, 0);
while (db_step(stmt)) { while (db_step(stmt)) {
struct fee_sum *sum; struct fee_sum *sum;
struct amount_msat debit;
bool ok;
sum = tal(sums, struct fee_sum); sum = tal(sums, struct fee_sum);
sum->txid = tal(sum, struct bitcoin_txid); sum->txid = tal(sum, struct bitcoin_txid);
@@ -246,8 +249,12 @@ struct fee_sum **calculate_onchain_fee_sums(const tal_t *ctx, struct db *db)
sum->acct_db_id = db_col_u64(stmt, "of.account_id"); sum->acct_db_id = db_col_u64(stmt, "of.account_id");
sum->acct_name = db_col_strdup(sum, stmt, "a.name"); sum->acct_name = db_col_strdup(sum, stmt, "a.name");
sum->currency = db_col_strdup(sum, stmt, "of.currency"); sum->currency = db_col_strdup(sum, stmt, "of.currency");
db_col_amount_msat(stmt, "fees", &sum->fees_paid); db_col_amount_msat(stmt, "credit", &sum->fees_paid);
db_col_amount_msat(stmt, "debit", &debit);
ok = amount_msat_sub(&sum->fees_paid, sum->fees_paid,
debit);
assert(ok);
tal_arr_expand(&sums, sum); tal_arr_expand(&sums, sum);
} }