Merge pull request #281 from ariard/harden-inbound-htlc-resolved

Harden test for logging of inbound htlc being resolved
This commit is contained in:
Matt Corallo 2019-01-04 23:07:29 -05:00 committed by GitHub
commit 0faf7bb094
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1844,9 +1844,12 @@ impl ChannelMonitor {
}
if payment_data.is_none() {
for htlc_output in $htlc_outputs {
if input.previous_output.vout == htlc_output.transaction_output_index {
if input.previous_output.vout == htlc_output.transaction_output_index && !htlc_output.offered {
log_info!(self, "Input spending {}:{} in {} resolves inbound HTLC with timeout from {}", input.previous_output.txid, input.previous_output.vout, tx.txid(), $source);
continue 'outer_loop;
} else if input.previous_output.vout == htlc_output.transaction_output_index && tx.lock_time > 0 {
log_info!(self, "Input spending {}:{} in {} resolves offered HTLC with HTLC-timeout from {}", input.previous_output.txid, input.previous_output.vout, tx.txid(), $source);
continue 'outer_loop;
}
}
}