Skip to content

Commit f7f5696

Browse files
committed
wallet: fix test calls to wallet_htlc_update.
The last argument is a pointer, but we were handing `false`. Which, for terrible historic reasons, gets treated as NULL. Signed-off-by: Rusty Russell <[email protected]>
1 parent b15023a commit f7f5696

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

wallet/test/run-wallet.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,6 +2160,7 @@ static bool test_htlc_crud(struct lightningd *ld, const tal_t *ctx)
21602160
struct htlc_in_map *htlcs_in = tal(ctx, struct htlc_in_map), *rem;
21612161
struct htlc_out_map *htlcs_out = tal(ctx, struct htlc_out_map);
21622162
struct onionreply *onionreply;
2163+
bool we_filled = false;
21632164

21642165
/* Make sure we have our references correct */
21652166
db_begin_transaction(w->db);
@@ -2199,17 +2200,17 @@ static bool test_htlc_crud(struct lightningd *ld, const tal_t *ctx)
21992200
wallet_err = tal_free(wallet_err);
22002201

22012202
/* Update */
2202-
CHECK_MSG(transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, RCVD_ADD_HTLC, NULL, 0, 0, NULL, NULL, false)),
2203+
CHECK_MSG(transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, RCVD_ADD_HTLC, NULL, 0, 0, NULL, NULL, &we_filled)),
22032204
"Update HTLC with null payment_key failed");
22042205
CHECK_MSG(
2205-
transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, SENT_REMOVE_HTLC, &payment_key, 0, 0, NULL, NULL, false)),
2206+
transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, SENT_REMOVE_HTLC, &payment_key, 0, 0, NULL, NULL, &we_filled)),
22062207
"Update HTLC with payment_key failed");
22072208
onionreply = new_onionreply(tmpctx, tal_arrz(tmpctx, u8, 100));
22082209
CHECK_MSG(
2209-
transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, SENT_REMOVE_HTLC, NULL, 0, 0, onionreply, NULL, false)),
2210+
transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, SENT_REMOVE_HTLC, NULL, 0, 0, onionreply, NULL, &we_filled)),
22102211
"Update HTLC with failonion failed");
22112212
CHECK_MSG(
2212-
transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, SENT_REMOVE_HTLC, NULL, 0, WIRE_INVALID_ONION_VERSION, NULL, NULL, false)),
2213+
transaction_wrap(w->db, wallet_htlc_update(w, in.dbid, SENT_REMOVE_HTLC, NULL, 0, WIRE_INVALID_ONION_VERSION, NULL, NULL, &we_filled)),
22132214
"Update HTLC with failcode failed");
22142215

22152216
CHECK_MSG(transaction_wrap(w->db, wallet_htlc_save_out(w, chan, &out)),
@@ -2221,7 +2222,7 @@ static bool test_htlc_crud(struct lightningd *ld, const tal_t *ctx)
22212222
CHECK(wallet_err);
22222223
wallet_err = tal_free(wallet_err);
22232224
CHECK_MSG(
2224-
transaction_wrap(w->db, wallet_htlc_update(w, out.dbid, SENT_ADD_ACK_REVOCATION, NULL, 0, 0, NULL, tal_arrz(tmpctx, u8, 100), false)),
2225+
transaction_wrap(w->db, wallet_htlc_update(w, out.dbid, SENT_ADD_ACK_REVOCATION, NULL, 0, 0, NULL, tal_arrz(tmpctx, u8, 100), &we_filled)),
22252226
"Update outgoing HTLC with failmsg failed");
22262227

22272228
/* Attempt to load them from the DB again */

0 commit comments

Comments
 (0)