wallet: remove unused total arg from wallet_extract_owned_outputs.

No caller uses it.

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

Author: rustyrussell

lightningd/chaintopology.c

@@ -50,7 +50,6 @@ static void filter_block_txs(struct chain_topology *topo, struct block *b)
 {
 	struct txfilter *filter = topo->bitcoind->ld->owned_txfilter;
 	size_t i;
-	struct amount_sat owned;
 
 	/* Now we see if any of those txs are interesting. */
 	const size_t num_txs = tal_count(b->full_txs);
@@ -77,11 +76,10 @@ static void filter_block_txs(struct chain_topology *topo, struct block *b)
 			}
 		}
 
-		owned = AMOUNT_SAT(0);
 		txid = b->txids[i];
 		if (txfilter_match(filter, tx)) {
 			wallet_extract_owned_outputs(topo->bitcoind->ld->wallet,
-						     tx->wtx, is_coinbase, &b->height, &owned);
+						     tx->wtx, is_coinbase, &b->height);
 			wallet_transaction_add(topo->ld->wallet, tx->wtx,
 					       b->height, i);
 			// invoice_check_onchain_payment(tx);

lightningd/channel_control.c

@@ -484,7 +484,6 @@ struct send_splice_info
 static void handle_tx_broadcast(struct send_splice_info *info)
 {
 	struct lightningd *ld = info->channel->peer->ld;
-	struct amount_sat unused;
 	struct json_stream *response;
 	struct bitcoin_txid txid;
 	u8 *tx_bytes;
@@ -496,7 +495,7 @@ static void handle_tx_broadcast(struct send_splice_info *info)
 	/* This might have spent UTXOs from our wallet */
 	num_utxos = wallet_extract_owned_outputs(ld->wallet,
 						 info->final_tx->wtx, false,
-						 NULL, &unused);
+						 NULL);
 	if (num_utxos)
 		wallet_transaction_add(ld->wallet, info->final_tx->wtx, 0, 0);
 

lightningd/dual_open_control.c

@@ -1667,14 +1667,12 @@ static void handle_tx_broadcast(struct channel_send *cs)
 	struct command *cmd = channel->openchannel_signed_cmd;
 	struct json_stream *response;
 	struct bitcoin_txid txid;
-	struct amount_sat unused;
 	int num_utxos;
 
 	/* This might have spent UTXOs from our wallet */
 	num_utxos = wallet_extract_owned_outputs(ld->wallet,
 						 /* FIXME: what txindex? */
-						 wtx, false, NULL,
-						 &unused);
+						 wtx, false, NULL);
 	if (num_utxos)
 		wallet_transaction_add(ld->wallet, wtx, 0, 0);
 

lightningd/peer_control.c

@@ -331,7 +331,7 @@ static struct bitcoin_tx *sign_and_send_last(const tal_t *ctx,
 	tx = sign_last_tx(ctx, channel, last_tx, last_sig);
 	bitcoin_txid(tx, &txid);
 	wallet_transaction_add(ld->wallet, tx->wtx, 0, 0);
-	wallet_extract_owned_outputs(ld->wallet, tx->wtx, false, NULL, NULL);
+	wallet_extract_owned_outputs(ld->wallet, tx->wtx, false, NULL);
 
 	/* Remember anchor information for commit_tx_boost */
 	adet = create_anchor_details(NULL, channel, tx);

lightningd/test/run-invoice-select-inchan.c

@@ -908,10 +908,6 @@ bool peer_start_channeld(struct channel *channel UNNEEDED,
 			 bool reconnected UNNEEDED,
 			 bool reestablish_only UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
-/* Generated stub for peer_start_closingd */
-void peer_start_closingd(struct channel *channel UNNEEDED,
-			 struct peer_fd *peer_fd UNNEEDED)
-{ fprintf(stderr, "peer_start_closingd called!\n"); abort(); }
 /* Generated stub for peer_start_dualopend */
 bool peer_start_dualopend(struct peer *peer UNNEEDED, struct peer_fd *peer_fd UNNEEDED,
 			  struct channel *channel UNNEEDED)
@@ -1045,8 +1041,7 @@ void wallet_delete_peer_if_unused(struct wallet *w UNNEEDED, u64 peer_dbid UNNEE
 /* Generated stub for wallet_extract_owned_outputs */
 int wallet_extract_owned_outputs(struct wallet *w UNNEEDED, const struct wally_tx *tx UNNEEDED,
 				 bool is_coinbase UNNEEDED,
-				 const u32 *blockheight UNNEEDED,
-				 struct amount_sat *total UNNEEDED)
+				 const u32 *blockheight UNNEEDED)
 { fprintf(stderr, "wallet_extract_owned_outputs called!\n"); abort(); }
 /* Generated stub for wallet_htlcs_load_in_for_channel */
 bool wallet_htlcs_load_in_for_channel(struct wallet *wallet UNNEEDED,

wallet/test/run-wallet.c

@@ -929,10 +929,6 @@ bool peer_start_channeld(struct channel *channel UNNEEDED,
 			 bool reconnected UNNEEDED,
 			 bool reestablish_only UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
-/* Generated stub for peer_start_closingd */
-void peer_start_closingd(struct channel *channel UNNEEDED,
-			 struct peer_fd *peer_fd UNNEEDED)
-{ fprintf(stderr, "peer_start_closingd called!\n"); abort(); }
 /* Generated stub for peer_start_dualopend */
 bool peer_start_dualopend(struct peer *peer UNNEEDED, struct peer_fd *peer_fd UNNEEDED,
 			  struct channel *channel UNNEEDED)

wallet/wallet.c

@@ -2914,13 +2914,10 @@ void wallet_confirm_tx(struct wallet *w,
 
 int wallet_extract_owned_outputs(struct wallet *w, const struct wally_tx *wtx,
 				 bool is_coinbase,
-				 const u32 *blockheight,
-				 struct amount_sat *total)
+				 const u32 *blockheight)
 {
 	int num_utxos = 0;
 
-	if (total)
-		*total = AMOUNT_SAT(0);
 	for (size_t i = 0; i < wtx->num_outputs; i++) {
 		const struct wally_tx_output *txout = &wtx->outputs[i];
 		struct utxo *utxo;
@@ -2983,12 +2980,6 @@ int wallet_extract_owned_outputs(struct wallet *w, const struct wally_tx *wtx,
 
 		outpointfilter_add(w->owned_outpoints, &utxo->outpoint);
 
-		if (total && !amount_sat_add(total, *total, utxo->amount))
-			fatal("Cannot add utxo output %zu/%zu %s + %s",
-			      i, wtx->num_outputs,
-			      fmt_amount_sat(tmpctx, *total),
-			      fmt_amount_sat(tmpctx, utxo->amount));
-
 		wallet_annotate_txout(w, &utxo->outpoint, TX_WALLET_DEPOSIT, 0);
 		tal_free(utxo);
 		num_utxos++;

wallet/wallet.h

@@ -761,8 +761,7 @@ u32 wallet_blocks_maxheight(struct wallet *w);
  */
 int wallet_extract_owned_outputs(struct wallet *w, const struct wally_tx *tx,
 				 bool is_coinbase,
-				 const u32 *blockheight,
-				 struct amount_sat *total);
+				 const u32 *blockheight);
 
 /**
  * wallet_htlc_save_in - store an htlc_in in the database

wallet/walletrpc.c

@@ -960,7 +960,6 @@ static void sendpsbt_done(struct bitcoind *bitcoind UNUSED,
 	struct lightningd *ld = sending->cmd->ld;
 	struct json_stream *response;
 	struct bitcoin_txid txid;
-	struct amount_sat change;
 
 	if (!success) {
 		/* Unreserve the inputs again. */
@@ -987,7 +986,7 @@ static void sendpsbt_done(struct bitcoind *bitcoind UNUSED,
 	wallet_transaction_add(ld->wallet, sending->wtx, 0, 0);
 
 	/* Extract the change output and add it to the DB */
-	wallet_extract_owned_outputs(ld->wallet, sending->wtx, false, NULL, &change);
+	wallet_extract_owned_outputs(ld->wallet, sending->wtx, false, NULL);
 	wally_txid(sending->wtx, &txid);
 
 	for (size_t i = 0; i < sending->psbt->num_outputs; i++)