Skip to content

Commit 54af4dd

Browse files
author
Antoine Riard
committed
Remove per_input_material introduce in commit 0011713
Caching of input material for HTLC transaction was introducted prevently but since then API (InputMaterial) has changed between ChannelMonitor and OnchainTxHandler
1 parent a0d913b commit 54af4dd

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

lightning/src/ln/channelmonitor.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,9 +1701,6 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
17011701
Err(_) => continue,
17021702
};
17031703

1704-
let mut per_input_material = HashMap::with_capacity(1);
1705-
per_input_material.insert(htlc_timeout_tx.input[0].previous_output, InputMaterial::LocalHTLC { witness_script: htlc_script, sigs: (*their_sig, our_sig), preimage: None, amount: htlc.amount_msat / 1000});
1706-
//TODO: with option_simplified_commitment track outpoint too
17071704
log_trace!(self, "Outpoint {}:{} is being being claimed", htlc_timeout_tx.input[0].previous_output.vout, htlc_timeout_tx.input[0].previous_output.txid);
17081705
res.push(htlc_timeout_tx);
17091706
} else {
@@ -1716,9 +1713,6 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
17161713
Err(_) => continue,
17171714
};
17181715

1719-
let mut per_input_material = HashMap::with_capacity(1);
1720-
per_input_material.insert(htlc_success_tx.input[0].previous_output, InputMaterial::LocalHTLC { witness_script: htlc_script, sigs: (*their_sig, our_sig), preimage: Some(*payment_preimage), amount: htlc.amount_msat / 1000});
1721-
//TODO: with option_simplified_commitment track outpoint too
17221716
log_trace!(self, "Outpoint {}:{} is being being claimed", htlc_success_tx.input[0].previous_output.vout, htlc_success_tx.input[0].previous_output.txid);
17231717
res.push(htlc_success_tx);
17241718
}

0 commit comments

Comments
 (0)