f Revert "Use real on-chain value where possible in get_claimable_balance"

Note that the test utility will become a fixup on a later commit,
the assertion change will move...somewhere, or maybe be its own commit

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -1435,20 +1435,16 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 						let mut delayed_output_pending = None;
 						for event in us.onchain_events_awaiting_threshold_conf.iter() {
 							match event.event {
-								OnchainEvent::HTLCUpdate {
-									commitment_tx_output_idx, onchain_value_satoshis, htlc_value_satoshis, .. }
+								OnchainEvent::HTLCUpdate { commitment_tx_output_idx, htlc_value_satoshis, .. }
 								if commitment_tx_output_idx == Some(htlc_commitment_tx_output_idx) => {
 									debug_assert!(htlc_update_pending.is_none());
-									htlc_update_pending = Some((
-										onchain_value_satoshis.unwrap_or(htlc_value_satoshis.unwrap()),
-										event.confirmation_threshold()));
+									debug_assert_eq!(htlc_value_satoshis.unwrap(), htlc.amount_msat / 1000);
+									htlc_update_pending = Some(event.confirmation_threshold());
 								},
-								OnchainEvent::HTLCSpendConfirmation {
-									commitment_tx_output_idx, preimage, onchain_value_satoshis, .. }
+								OnchainEvent::HTLCSpendConfirmation { commitment_tx_output_idx, preimage, .. }
 								if commitment_tx_output_idx == htlc_commitment_tx_output_idx => {
 									debug_assert!(htlc_spend_pending.is_none());
-									htlc_spend_pending = Some((event.confirmation_threshold(),
-										preimage.is_some(), onchain_value_satoshis));
+									htlc_spend_pending = Some((event.confirmation_threshold(), preimage.is_some()));
 								},
 								OnchainEvent::MaturingOutput {
 									descriptor: SpendableOutputDescriptor::DelayedPaymentOutput(ref descriptor) }
@@ -1481,9 +1477,9 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 								// If the payment was outbound, check if there's an HTLCUpdate
 								// indicating we have spent this HTLC with a timeout, claiming it back
 								// and awaiting confirmations on it.
-								if let Some((value, conf_thresh)) = htlc_update_pending {
+								if let Some(conf_thresh) = htlc_update_pending {
 									res.push(Balance::ClaimableAwaitingConfirmations {
-										claimable_amount_satoshis: value,
+										claimable_amount_satoshis: htlc.amount_msat / 1000,
 										confirmation_height: conf_thresh,
 									});
 								} else {
@@ -1499,9 +1495,9 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 								// preimage, we lost funds to our counterparty! We will then continue
 								// to show it as ContentiousClaimable until ANTI_REORG_DELAY.
 								debug_assert!(htlc_update_pending.is_none());
-								if let Some((conf_thresh, true, value)) = htlc_spend_pending {
+								if let Some((conf_thresh, true)) = htlc_spend_pending {
 									res.push(Balance::ClaimableAwaitingConfirmations {
-										claimable_amount_satoshis: value.unwrap_or(htlc.amount_msat / 1000),
+										claimable_amount_satoshis: htlc.amount_msat / 1000,
 										confirmation_height: conf_thresh,
 									});
 								} else {

lightning/src/ln/monitor_tests.rs

@@ -512,14 +512,11 @@ fn do_test_claim_value_force_close(prev_commitment_tx: bool) {
 	let node_b_htlc_claimable = nodes[1].best_block_info().1 + BREAKDOWN_TIMEOUT as u32;
 	mine_transaction(&nodes[1], &b_broadcast_txn[0]);
 
-	fuzzy_assert_eq(b_broadcast_txn[0].output[0].value,
-		3_000 - chan_feerate * b_broadcast_txn[0].weight() as u64 / 1_000);
-
 	assert_eq!(sorted_vec(vec![Balance::ClaimableAwaitingConfirmations {
 			claimable_amount_satoshis: 1_000,
 			confirmation_height: node_b_commitment_claimable,
 		}, Balance::ClaimableAwaitingConfirmations {
-			claimable_amount_satoshis: b_broadcast_txn[0].output[0].value,
+			claimable_amount_satoshis: 3_000,
 			confirmation_height: node_b_htlc_claimable,
 		}, Balance::ContentiousClaimable {
 			claimable_amount_satoshis: 4_000,
@@ -533,7 +530,7 @@ fn do_test_claim_value_force_close(prev_commitment_tx: bool) {
 	test_spendable_output(&nodes[1], &remote_txn[0]);
 
 	assert_eq!(sorted_vec(vec![Balance::ClaimableAwaitingConfirmations {
-			claimable_amount_satoshis: b_broadcast_txn[0].output[0].value,
+			claimable_amount_satoshis: 3_000,
 			confirmation_height: node_b_htlc_claimable,
 		}, Balance::ContentiousClaimable {
 			claimable_amount_satoshis: 4_000,