f make logic more readable

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -10221,18 +10221,19 @@ where
 									// `channel_update`s for any channels less than a week old.
 									let funding_conf_height =
 										channel.context.get_funding_tx_confirmation_height().unwrap_or(height);
-									let mut should_announce = announcement_sigs.is_some() || funding_conf_height < height + 1008;
 									// To avoid broadcast storms after each block, only
 									// re-broadcast every hour (6 blocks) after the initial
 									// broadcast, or if this is the first time we're ready to
 									// broadcast this channel.
-									should_announce &= announcement_sigs.is_some() || funding_conf_height % 6 == height % 6;
+									let rebroadcast_announcement = funding_conf_height < height + 1008
+										&& funding_conf_height % 6 == height % 6;
+									let mut should_announce = announcement_sigs.is_some() || rebroadcast_announcement;
 									// Most of our tests were written when we only broadcasted
 									// `channel_announcement`s once and then never re-broadcasted
 									// them again, so disable the re-broadcasting entirely in tests
 									#[cfg(test)]
 									{
-										should_announce &= announcement_sigs.is_some();
+										should_announce = announcement_sigs.is_some();
 									}
 									if should_announce {
 										if let Some(announcement) = channel.get_signed_channel_announcement(