Adds the message id to GossipsubEvent

examples/gossipsub-chat.rs

@@ -130,9 +130,10 @@ fn main() {
         loop {
             match swarm.poll().expect("Error while polling swarm") {
                 Async::Ready(Some(gossip_event)) => match gossip_event {
-                    GossipsubEvent::Message(peer_id, message) => println!(
-                        "Got message: {:?} from peer {:?}",
+                    GossipsubEvent::Message(peer_id, id, message) => println!(
+                        "Got message: {} with id: {} from peer: {:?}",
                         String::from_utf8_lossy(&message.data),
+                        id,
                         peer_id
                     ),
                     _ => {}

protocols/gossipsub/src/behaviour.rs

@@ -553,7 +553,7 @@ impl<TSubstream> Gossipsub<TSubstream> {
         if self.mesh.keys().any(|t| msg.topics.iter().any(|u| t == u)) {
             debug!("Sending received message to user");
             self.events.push_back(NetworkBehaviourAction::GenerateEvent(
-                GossipsubEvent::Message(propagation_source.clone(), msg.clone()),
+                GossipsubEvent::Message(propagation_source.clone(), msg_id, msg.clone()),
             ));
         }
 
@@ -1178,9 +1178,10 @@ pub struct GossipsubRpc {
 /// Event that can happen on the gossipsub behaviour.
 #[derive(Debug)]
 pub enum GossipsubEvent {
-    /// A message has been received. This contains the PeerId that we received the message from
-    /// and the actual message.
-    Message(PeerId, GossipsubMessage),
+    /// A message has been received. This contains the PeerId that we received the message from,
+    /// the message id (used if the application layer needs to propagate the message) and the
+    /// message itself.
+    Message(PeerId, MessageId, GossipsubMessage),
 
     /// A remote subscribed to a topic.
     Subscribed {

protocols/gossipsub/src/lib.rs

@@ -146,5 +146,5 @@ mod topic;
 
 pub use self::behaviour::{Gossipsub, GossipsubEvent, GossipsubRpc};
 pub use self::config::{GossipsubConfig, GossipsubConfigBuilder};
-pub use self::protocol::GossipsubMessage;
+pub use self::protocol::{GossipsubMessage, MessageId};
 pub use self::topic::{Topic, TopicHash};

protocols/gossipsub/src/protocol.rs

@@ -276,6 +276,18 @@ impl Decoder for GossipsubCodec {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MessageId(pub String);
 
+impl std::fmt::Display for MessageId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl Into<String> for MessageId {
+    fn into(self) -> String {
+        self.0.into()
+    }
+}
+
 /// A message received by the gossipsub system.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct GossipsubMessage {