X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=7e11c521ca0d4f5cfa9e30a3bc4ba1d59e35173c;hb=feb472dc9ef971b926b19d27e1ad05a79423778f;hp=4a1b5e8a790cd7ce57cf93b8261a9fdca40a951a;hpb=a0373dc83e9d6a903df2f9feeb665290c49f4c44;p=rust-lightning diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs index 4a1b5e8a..7e11c521 100644 --- a/lightning/src/ln/functional_test_utils.rs +++ b/lightning/src/ln/functional_test_utils.rs @@ -920,15 +920,21 @@ pub fn test_txn_broadcast(node: &Node, chan: &(msgs::ChannelUpdate, msgs::Channe /// Tests that the given node has broadcast a claim transaction against the provided revoked /// HTLC transaction. -pub fn test_revoked_htlc_claim_txn_broadcast(node: &Node, revoked_tx: Transaction) { +pub fn test_revoked_htlc_claim_txn_broadcast(node: &Node, revoked_tx: Transaction, commitment_revoked_tx: Transaction) { let mut node_txn = node.tx_broadcaster.txn_broadcasted.lock().unwrap(); - assert_eq!(node_txn.len(), 1); + // We should issue a 2nd transaction if one htlc is dropped from initial claiming tx + // but sometimes not as feerate is too-low + if node_txn.len() != 1 && node_txn.len() != 2 { assert!(false); } node_txn.retain(|tx| { if tx.input.len() == 1 && tx.input[0].previous_output.txid == revoked_tx.txid() { - check_spends!(tx, revoked_tx.clone()); + check_spends!(tx, revoked_tx); false } else { true } }); + node_txn.retain(|tx| { + check_spends!(tx, commitment_revoked_tx); + false + }); assert!(node_txn.is_empty()); }