rebase on latest master, update deprecated type_to_string calls

ElementsProject · Apr 23, 2024 · 109da8d · 109da8d
1 parent 99f70f8
commit 109da8d
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/plugins/bkpr/bookkeeper.c b/plugins/bkpr/bookkeeper.c
@@ -1724,10 +1724,10 @@ static struct command_result *json_utxo_deposit(struct command *cmd, const char
 
 	plugin_log(cmd->plugin, LOG_DBG, "%s (%s|%s) %s -%s %"PRIu64" %d %s",
 		   move_tag, ev.tag, ev.acct_name,
-		   type_to_string(tmpctx, struct amount_msat, &ev.credit),
-		   type_to_string(tmpctx, struct amount_msat, &ev.debit),
+		   fmt_amount_msat(tmpctx, ev.credit),
+		   fmt_amount_msat(tmpctx, ev.debit),
 		   ev.timestamp, ev.blockheight,
-		   type_to_string(tmpctx, struct bitcoin_outpoint, &ev.outpoint));
+		   fmt_bitcoin_outpoint(tmpctx, &ev.outpoint));
 
 	if (!log_chain_event(cmd, db, acct, &ev)) {
 		db_commit_transaction(db);
@@ -1800,11 +1800,11 @@ static struct command_result *json_utxo_spend(struct command *cmd, const char *b
 
 	plugin_log(cmd->plugin, LOG_DBG, "%s (%s|%s) %s -%s %"PRIu64" %d %s %s",
 		   move_tag, ev.tag, acct_name,
-		   type_to_string(tmpctx, struct amount_msat, &ev.credit),
-		   type_to_string(tmpctx, struct amount_msat, &ev.debit),
+		   fmt_amount_msat(tmpctx, ev.credit),
+		   fmt_amount_msat(tmpctx, ev.debit),
 		   ev.timestamp, ev.blockheight,
-		   type_to_string(tmpctx, struct bitcoin_outpoint, &ev.outpoint),
-		   type_to_string(tmpctx, struct bitcoin_txid, ev.spending_txid));
+		   fmt_bitcoin_outpoint(tmpctx, &ev.outpoint),
+		   fmt_bitcoin_txid(tmpctx, ev.spending_txid));
 
 	if (!log_chain_event(cmd, db, acct, &ev)) {
 		db_commit_transaction(db);