f maybe fix tests on ci?

Author: TheBlueMatt

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -3951,14 +3951,15 @@ fn test_single_channel_multiple_mpp() {
 	let thrd3 = std::thread::spawn(move || {
 		std::thread::sleep(MAX_THREAD_INIT_TIME);
 		do_a_write_background.send(()).unwrap();
+		std::thread::sleep(MAX_THREAD_INIT_TIME);
+		do_a_write_background.send(()).unwrap();
 	});
 	nodes[6].node.handle_revoke_and_ack(node_5_id, &raa);
 	thrd3.join().unwrap();
 
 	let thrd4 = std::thread::spawn(move || {
 		std::thread::sleep(MAX_THREAD_INIT_TIME);
 		do_a_write.send(()).unwrap();
-		do_a_write.send(()).unwrap();
 	});
 
 	thrd4.join().unwrap();
@@ -3978,11 +3979,19 @@ fn test_single_channel_multiple_mpp() {
 	let (updates, raa) = get_updates_and_revoke(&nodes[6], &nodes[5].node.get_our_node_id());
 	nodes[5].node.handle_update_fulfill_htlc(node_6_id, &updates.update_fulfill_htlcs[0]);
 	expect_payment_forwarded!(nodes[5], nodes[2], nodes[6], Some(1000), false, false);
-	nodes[5].node.handle_update_fulfill_htlc(node_6_id, &updates.update_fulfill_htlcs[1]);
-	expect_payment_forwarded!(nodes[5], nodes[3], nodes[6], Some(1000), false, false);
+	let mut next_from = 3;
+	if let Some(update) = updates.update_fulfill_htlcs.get(1) {
+		nodes[5].node.handle_update_fulfill_htlc(node_6_id, update);
+		expect_payment_forwarded!(nodes[5], nodes[next_from], nodes[6], Some(1000), false, false);
+		next_from += 1;
+	}
 	nodes[5].node.handle_commitment_signed(node_6_id, &updates.commitment_signed);
 	nodes[5].node.handle_revoke_and_ack(node_6_id, &raa);
-	check_added_monitors(&nodes[5], 4);
+	if updates.update_fulfill_htlcs.get(1).is_some() {
+		check_added_monitors(&nodes[5], 4);
+	} else {
+		check_added_monitors(&nodes[5], 3);
+	}
 
 	let (raa, cs) = get_revoke_commit_msgs(&nodes[5], &node_6_id);
 
@@ -3992,10 +4001,19 @@ fn test_single_channel_multiple_mpp() {
 
 	let (updates, raa) = get_updates_and_revoke(&nodes[6], &nodes[5].node.get_our_node_id());
 	nodes[5].node.handle_update_fulfill_htlc(node_6_id, &updates.update_fulfill_htlcs[0]);
-	expect_payment_forwarded!(nodes[5], nodes[4], nodes[6], Some(1000), false, false);
+	expect_payment_forwarded!(nodes[5], nodes[next_from], nodes[6], Some(1000), false, false);
+	next_from += 1;
+	if let Some(update) = updates.update_fulfill_htlcs.get(1) {
+		nodes[5].node.handle_update_fulfill_htlc(node_6_id, update);
+		expect_payment_forwarded!(nodes[5], nodes[next_from], nodes[6], Some(1000), false, false);
+	}
 	nodes[5].node.handle_commitment_signed(node_6_id, &updates.commitment_signed);
 	nodes[5].node.handle_revoke_and_ack(node_6_id, &raa);
-	check_added_monitors(&nodes[5], 3);
+	if updates.update_fulfill_htlcs.get(1).is_some() {
+		check_added_monitors(&nodes[5], 4);
+	} else {
+		check_added_monitors(&nodes[5], 3);
+	}
 
 	let (raa, cs) = get_revoke_commit_msgs(&nodes[5], &node_6_id);
 	nodes[6].node.handle_revoke_and_ack(node_5_id, &raa);