f for code hygene don't update the updateid if not returning one - Jeff

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -4195,16 +4195,16 @@ impl<Signer: Sign> Channel<Signer> {
 			// monitor update to the user, even if we return one).
 			// See test_duplicate_chan_id and test_pre_lockin_no_chan_closed_update for more.
 			if self.channel_state & (ChannelState::FundingSent as u32 | ChannelState::ChannelFunded as u32 | ChannelState::ShutdownComplete as u32) != 0 {
+				self.latest_monitor_update_id += 1;
 				Some((funding_txo, ChannelMonitorUpdate {
-					update_id: self.latest_monitor_update_id + 1,
+					update_id: self.latest_monitor_update_id,
 					updates: vec![ChannelMonitorUpdateStep::ChannelForceClosed { should_broadcast }],
 				}))
 			} else { None }
 		} else { None };
 
 		self.channel_state = ChannelState::ShutdownComplete as u32;
 		self.update_time_counter += 1;
-		self.latest_monitor_update_id += 1;
 		(monitor_update, dropped_outbound_htlcs)
 	}
 }