Fix broadcast message order

contrun · Jan 1, 2025 · ea5c1fe · ea5c1fe
1 parent 8ca34e0
commit ea5c1fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/fiber/gossip.rs b/src/fiber/gossip.rs
@@ -1031,6 +1031,10 @@ impl<S: GossipMessageStore> ExtendedGossipMessageStoreState<S> {
 
         let mut sorted_messages = complete_messages.into_iter().collect::<Vec<_>>();
         sorted_messages.sort_unstable();
+        trace!(
+            "Saving complete messages to the store: {:?}",
+            &sorted_messages
+        );
 
         let mut verified_sorted_messages = Vec::with_capacity(sorted_messages.len());
         for message in sorted_messages {

diff --git a/src/fiber/types.rs b/src/fiber/types.rs
@@ -2615,14 +2615,14 @@ impl Ord for BroadcastMessageID {
                 BroadcastMessageID::NodeAnnouncement(pubkey1),
                 BroadcastMessageID::NodeAnnouncement(pubkey2),
             ) => pubkey1.cmp(pubkey2),
-            (BroadcastMessageID::ChannelUpdate(_), _) => Ordering::Less,
-            (BroadcastMessageID::NodeAnnouncement(_), _) => Ordering::Greater,
+            (BroadcastMessageID::NodeAnnouncement(_), _) => Ordering::Less,
+            (BroadcastMessageID::ChannelUpdate(_), _) => Ordering::Greater,
             (
                 BroadcastMessageID::ChannelAnnouncement(_),
                 BroadcastMessageID::NodeAnnouncement(_),
-            ) => Ordering::Less,
+            ) => Ordering::Greater,
             (BroadcastMessageID::ChannelAnnouncement(_), BroadcastMessageID::ChannelUpdate(_)) => {
-                Ordering::Greater
+                Ordering::Less
             }
         }
     }