lightningd: explicit db arg to wait_index_increase so we can use it in migrations.

Before db is complete, ld->wallet->db is NULL.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

lightningd/peer_htlcs.c

@@ -3059,7 +3059,8 @@ void htlcs_index_deleted(struct lightningd *ld,
 			 const struct channel *channel,
 			 u64 num_deleted)
 {
-	wait_index_increase(ld, WAIT_SUBSYSTEM_HTLCS, WAIT_INDEX_DELETED,
+	wait_index_increase(ld, ld->wallet->db,
+			    WAIT_SUBSYSTEM_HTLCS, WAIT_INDEX_DELETED,
 			    num_deleted,
 			    "short_channel_id", fmt_short_channel_id(tmpctx, channel_scid_or_local_alias(channel)),
 			    NULL);

lightningd/wait.c

@@ -189,6 +189,7 @@ u64 wait_index_increment(struct lightningd *ld,
 }
 
 void wait_index_increase(struct lightningd *ld,
+			 struct db *db,
 			 enum wait_subsystem subsystem,
 			 enum wait_index index,
 			 u64 num,
@@ -200,7 +201,7 @@ void wait_index_increase(struct lightningd *ld,
 		return;
 
 	va_start(ap, num);
-	wait_index_bump(ld, ld->wallet->db, subsystem, index, num, ap);
+	wait_index_bump(ld, db, subsystem, index, num, ap);
 	va_end(ap);
 }
 

lightningd/wait.h

@@ -57,6 +57,7 @@ u64 LAST_ARG_NULL wait_index_increment(struct lightningd *ld,
 /**
  * wait_index_increase - increase an index, tell waiters.
  * @ld: the lightningd
+ * @db: the database (usually ld->wallet->db, except really early)
  * @subsystem: subsystem for index
  * @index: which index
  * @num: number to add (if > 0).
@@ -65,6 +66,7 @@ u64 LAST_ARG_NULL wait_index_increment(struct lightningd *ld,
  * A more generic version if wait_index_increment: if num is 0 it's a noop.
  */
 void LAST_ARG_NULL wait_index_increase(struct lightningd *ld,
+				       struct db *db,
 				       enum wait_subsystem subsystem,
 				       enum wait_index index,
 				       u64 num,