f also test fee udpate

Author: TheBlueMatt

lightning/src/ln/shutdown_tests.rs

@@ -1211,9 +1211,7 @@ fn simple_target_feerate_shutdown() {
 	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure, [nodes[0].node.get_our_node_id()], 100000);
 }
 
-
-#[test]
-fn htlc_removal_no_early_closing_signed() {
+fn do_outbound_update_no_early_closing_signed(use_htlc: bool) {
 	// Previously, if we have a pending inbound HTLC on a channel which has initiated shutdown,
 	// we'd send our initial closing_signed immediately after receiving the peer's last RAA to
 	// remove the HTLC, but before receiving their final commitment_signed for a commitment without
@@ -1227,7 +1225,25 @@ fn htlc_removal_no_early_closing_signed() {
 	let chan_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
 
 	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
-	let payment_hash = route_payment(&nodes[1], &[&nodes[0]], 10_000).1;
+	let payment_hash_opt = if use_htlc {
+		Some(route_payment(&nodes[1], &[&nodes[0]], 10_000).1)
+	} else {
+		None
+	};
+
+	if use_htlc {
+		nodes[0].node.fail_htlc_backwards(&payment_hash_opt.unwrap());
+		expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[0],
+			[HTLCDestination::FailedPayment { payment_hash: payment_hash_opt.unwrap() }]);
+	} else {
+		{
+			let mut feerate_lock = chanmon_cfgs[0].fee_estimator.sat_per_kw.lock().unwrap();
+			*feerate_lock *= 10;
+		}
+		nodes[0].node.timer_tick_occurred();
+	}
+	let updates = get_htlc_update_msgs(&nodes[0], &nodes[1].node.get_our_node_id());
+	check_added_monitors(&nodes[0], 1);
 
 	nodes[1].node.close_channel(&chan_id, &nodes[0].node.get_our_node_id()).unwrap();
 	let node_0_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
@@ -1237,12 +1253,11 @@ fn htlc_removal_no_early_closing_signed() {
 	nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_0_shutdown);
 	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_1_shutdown);
 
-	nodes[0].node.fail_htlc_backwards(&payment_hash);
-	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[0], [HTLCDestination::FailedPayment { payment_hash }]);
-	let updates = get_htlc_update_msgs(&nodes[0], &nodes[1].node.get_our_node_id());
-	check_added_monitors(&nodes[0], 1);
-
-	nodes[1].node.handle_update_fail_htlc(&nodes[0].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
+	if use_htlc {
+		nodes[1].node.handle_update_fail_htlc(&nodes[0].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
+	} else {
+		nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), &updates.update_fee.unwrap());
+	}
 	nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &updates.commitment_signed);
 	check_added_monitors(&nodes[1], 1);
 	let (bs_raa, bs_cs) = get_revoke_commit_msgs(&nodes[1], &nodes[0].node.get_our_node_id());
@@ -1271,7 +1286,9 @@ fn htlc_removal_no_early_closing_signed() {
 	if let MessageSendEvent::SendRevokeAndACK { msg, .. } = &as_raa_closing_signed[0] {
 		nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &msg);
 		check_added_monitors(&nodes[1], 1);
-		expect_payment_failed!(nodes[1], payment_hash, true);
+		if use_htlc {
+			expect_payment_failed!(nodes[1], payment_hash_opt.unwrap(), true);
+		}
 	} else { panic!("Unexpected message {:?}", as_raa_closing_signed[0]); }
 
 	if let MessageSendEvent::SendClosingSigned { msg, .. } = &as_raa_closing_signed[1] {
@@ -1288,3 +1305,9 @@ fn htlc_removal_no_early_closing_signed() {
 	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure, [nodes[1].node.get_our_node_id()], 100000);
 	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure, [nodes[0].node.get_our_node_id()], 100000);
 }
+
+#[test]
+fn outbound_update_no_early_closing_signed() {
+	do_outbound_update_no_early_closing_signed(true);
+	do_outbound_update_no_early_closing_signed(false);
+}