chore: make code more readable

nervosnetwork · Jan 6, 2025 · 93bdbb5 · 93bdbb5
1 parent a82e613
commit 93bdbb5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/fiber/channel.rs b/src/fiber/channel.rs
@@ -4390,6 +4390,12 @@ impl ChannelActorState {
             .expect("Funding transaction outpoint is present")
     }
 
+    pub fn must_get_funding_transaction_timestamp(&self) -> u64 {
+        self.funding_tx_confirmed_at
+            .expect("Funding transaction confirmed at present")
+            .2
+    }
+
     pub fn get_local_shutdown_script(&self) -> Script {
         self.local_shutdown_script.clone()
     }
@@ -5388,9 +5394,7 @@ impl ChannelActorState {
                 .send_message(NetworkActorMessage::new_command(
                     NetworkActorCommand::BroadcastMessages(vec![
                         BroadcastMessageWithTimestamp::ChannelAnnouncement(
-                            self.funding_tx_confirmed_at
-                                .expect("funding tx confirmed")
-                                .2,
+                            self.must_get_funding_transaction_timestamp(),
                             channel_announcement,
                         ),
                         BroadcastMessageWithTimestamp::ChannelUpdate(channel_update),

diff --git a/src/fiber/gossip.rs b/src/fiber/gossip.rs
@@ -1085,21 +1085,22 @@ impl<S: GossipMessageStore> ExtendedGossipMessageStoreState<S> {
         self.broadcast_messages(messages);
     }
 
-    fn get_channel_annnouncement(&self, outpoint: &OutPoint) -> Option<(u64, ChannelAnnouncement)> {
+    fn get_channel_annnouncement(&self, outpoint: &OutPoint) -> Option<ChannelAnnouncement> {
         self.store
             .get_latest_channel_announcement(outpoint)
+            .map(|(_, m)| m)
             .or_else(|| self.get_channel_annnouncement_in_memory(outpoint))
     }
 
     fn get_channel_annnouncement_in_memory(
         &self,
         outpoint: &OutPoint,
-    ) -> Option<(u64, ChannelAnnouncement)> {
+    ) -> Option<ChannelAnnouncement> {
         self.messages_to_be_saved.iter().find_map(|m| match m {
             BroadcastMessage::ChannelAnnouncement(channel_announcement)
                 if &channel_announcement.channel_outpoint == outpoint =>
             {
-                Some((0, channel_announcement.clone()))
+                Some(channel_announcement.clone())
             }
             _ => None,
         })
@@ -1119,7 +1120,7 @@ impl<S: GossipMessageStore> ExtendedGossipMessageStoreState<S> {
             }
         }
 
-        if let Some(_) = self.messages_to_be_saved.get(&message) {
+        if self.messages_to_be_saved.contains(&message) {
             return Ok(());
         }