Skip to content

Commit 6755b97

Browse files
committed
Drop dup txn in test_dynamic_spendable_outputs_local_htlc_success_tx
Previously, test_dynamic_spendable_outputs_local_htlc_success_tx called connect_block with two identical transactions, which resulted in duplicate SpendableOutputs Events back-to-back. This is a test issue as such a block_connected call represents an invalid block.
1 parent 28e47c2 commit 6755b97

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

lightning/src/ln/functional_tests.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5372,6 +5372,7 @@ fn test_dynamic_spendable_outputs_local_htlc_success_tx() {
53725372

53735373
let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 9000000).0;
53745374
let local_txn = get_local_commitment_txn!(nodes[1], chan_1.2);
5375+
assert_eq!(local_txn.len(), 1);
53755376
assert_eq!(local_txn[0].input.len(), 1);
53765377
check_spends!(local_txn[0], chan_1.3);
53775378

@@ -5392,10 +5393,13 @@ fn test_dynamic_spendable_outputs_local_htlc_success_tx() {
53925393
}
53935394
let node_txn = {
53945395
let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
5396+
assert_eq!(node_txn.len(), 3);
5397+
assert_eq!(node_txn[0], node_txn[2]);
5398+
assert_eq!(node_txn[1], local_txn[0]);
53955399
assert_eq!(node_txn[0].input.len(), 1);
53965400
assert_eq!(node_txn[0].input[0].witness.last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
53975401
check_spends!(node_txn[0], local_txn[0]);
5398-
vec![node_txn[0].clone(), node_txn[2].clone()]
5402+
vec![node_txn[0].clone()]
53995403
};
54005404

54015405
let header_201 = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
@@ -5404,9 +5408,8 @@ fn test_dynamic_spendable_outputs_local_htlc_success_tx() {
54045408

54055409
// Verify that B is able to spend its own HTLC-Success tx thanks to spendable output event given back by its ChannelMonitor
54065410
let spend_txn = check_spendable_outputs!(nodes[1], 1, node_cfgs[1].keys_manager, 100000);
5407-
assert_eq!(spend_txn.len(), 2);
5411+
assert_eq!(spend_txn.len(), 1);
54085412
check_spends!(spend_txn[0], node_txn[0]);
5409-
check_spends!(spend_txn[1], node_txn[1]);
54105413
}
54115414

54125415
fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, announce_latest: bool) {

0 commit comments

Comments
 (0)