f Require cooperative close on both nodes

Ensure the full-cycle assertion covers both channel parties.

Co-Authored-By: HAL 9000

Author: tnull

tests/common/mod.rs

@@ -436,6 +436,28 @@ fn assert_any_node_has_onchain_tx_type<F: Fn(&TransactionType) -> bool + Copy>(
 	panic!("Expected on-chain payment with tx_type {}; observed {:?}", tx_type_name, observed);
 }
 
+fn assert_all_nodes_have_onchain_tx_type<F: Fn(&TransactionType) -> bool + Copy>(
+	nodes: &[(&str, &TestNode)], tx_type_name: &str, predicate: F,
+) {
+	if nodes.iter().all(|(_, node)| has_onchain_tx_type(node, predicate)) {
+		return;
+	}
+
+	let observed: Vec<String> = nodes
+		.iter()
+		.flat_map(|(name, node)| {
+			node.list_payments().into_iter().filter_map(move |payment| match payment.kind {
+				PaymentKind::Onchain { tx_type, .. } => Some(format!("{}:{:?}", name, tx_type)),
+				_ => None,
+			})
+		})
+		.collect();
+	panic!(
+		"Expected all nodes to have on-chain payment with tx_type {}; observed {:?}",
+		tx_type_name, observed
+	);
+}
+
 async fn settle_force_close_balance<E: ElectrumApi>(
 	node: &TestNode, counterparty_node_id: PublicKey, peer_node: &TestNode,
 	bitcoind: &BitcoindClient, electrsd: &E,
@@ -1625,7 +1647,7 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 			|tx_type| matches!(tx_type, TransactionType::Sweep { .. }),
 		);
 	} else {
-		assert_any_node_has_onchain_tx_type(
+		assert_all_nodes_have_onchain_tx_type(
 			&[("node_a", &node_a), ("node_b", &node_b)],
 			"CooperativeClose",
 			|tx_type| matches!(tx_type, TransactionType::CooperativeClose { .. }),