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

db: Fix the ordering of channel_htlcs in postgres

Browse Source 
I discovered this while reworking the CI workflow, and it seems like
the HTLC queries do not order, while the tests assume a specific
order. This matches sqlite3 which without an explicit ORDER clause
will use insertion order, while postgres does not keep things in
insertion order, thus breaking the assumption. Ordering by `id`
re-establishes that implicit assumption

Changelog-Changed: postgres: Ordering of HTLCs in `listhtlcs` are now ordered by time of creation
This commit is contained in:
Christian Decker
2022-12-30 17:12:16 +01:00
parent af502eb625
commit 845503f72e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wallet/wallet.c
View File

@@ -5460,7 +5460,8 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
", h.payment_hash" ", h.payment_hash"
", h.hstate" ", h.hstate"
" FROM channel_htlcs h" " FROM channel_htlcs h"
" WHERE channel_id = ?")); " WHERE channel_id = ?"
" ORDER BY id ASC"));
db_bind_u64(i->stmt, 0, chan->dbid); db_bind_u64(i->stmt, 0, chan->dbid);
} else { } else {
i->scid.u64 = 0; i->scid.u64 = 0;
@@ -5474,7 +5475,8 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
", h.payment_hash" ", h.payment_hash"
", h.hstate" ", h.hstate"
" FROM channel_htlcs h" " FROM channel_htlcs h"
" JOIN channels ON channels.id = h.channel_id")); " JOIN channels ON channels.id = h.channel_id"
" ORDER BY h.id ASC"));
} }
/* FIXME: db_prepare should take ctx! */ /* FIXME: db_prepare should take ctx! */
tal_steal(i, i->stmt); tal_steal(i, i->stmt);