f fixes

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -11384,12 +11384,12 @@ where
 				} else {
 					debug_assert!(false);
 				}
-				if self.context.minimum_depth(&self.funding).expect("set for a ready channel") > 1 {
+				if self.context.minimum_depth(&self.funding).expect("set for a ready channel") > 0 {
 					// Reset the original short_channel_id so that we'll generate a closure
 					// `channel_update` broadcast event.
 					self.funding.short_channel_id = original_scid;
-					let err_reason = format!("Funding transaction was un-confirmed. Locked at {} confs, now have {} confs.",
-						self.context.minimum_depth.unwrap(), funding_tx_confirmations);
+					let err_reason = format!("Funding transaction was un-confirmed, originally locked at {} confs.",
+						self.context.minimum_depth.unwrap());
 					return Err(ClosureReason::ProcessingError { err: err_reason });
 				}
 			}

lightning/src/ln/reorg_tests.rs

@@ -386,9 +386,9 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
 		assert_eq!(txn.len(), 1);
 	}
 
-	let expected_err = "Funding transaction was un-confirmed. Locked at 6 confs, now have 0 confs.";
+	let expected_err = "Funding transaction was un-confirmed, originaly locked at 6 confs.";
 	if reorg_after_reload || !reload_node {
-		handle_announce_close_broadcast_events(&nodes, 0, 1, true, "Channel closed because of an exception: Funding transaction was un-confirmed. Locked at 6 confs, now have 0 confs.");
+		handle_announce_close_broadcast_events(&nodes, 0, 1, true, "Channel closed because of an exception: Funding transaction was un-confirmed, originally locked at 6 confs");
 		check_added_monitors!(nodes[1], 1);
 		let reason = ClosureReason::CounterpartyForceClosed { peer_msg: UntrustedString(format!("Channel closed because of an exception: {}", expected_err)) };
 		check_closed_event(&nodes[1], 1, reason, &[nodes[0].node.get_our_node_id()], 100000);