update to latest libp2p changes

Author: jxs

gossipsub-interop/rust-libp2p/Cargo.lock

@@ -1,7 +1,4 @@
-use libp2p_gossipsub::{
-    partial::{Metadata, PublishAction},
-    Partial, PartialMessageError,
-};
+use libp2p_gossipsub::partial_messages::{Metadata, Partial, PartialAction, PartialError};
 
 /// A fixed-size bitmap composed of `TOTAL_FIELDS` fields,
 /// each field storing `FIELD_SIZE` bytes (i.e., `FIELD_SIZE * 8` bits).
@@ -49,22 +46,22 @@ impl Bitmap {
     pub(crate) fn extend_from_encoded_partial_message(
         &mut self,
         data: &[u8],
-    ) -> Result<(), PartialMessageError> {
+    ) -> Result<(), PartialError> {
         if data.len() < 1 + self.group_id.len() {
-            return Err(PartialMessageError::InvalidFormat);
+            return Err(PartialError::InvalidFormat);
         }
 
         let bitmap = data[0];
         let data = &data[1..];
         let (data, group_id) = data.split_at(data.len() - self.group_id.len());
         if group_id != self.group_id {
-            return Err(PartialMessageError::WrongGroup {
+            return Err(PartialError::WrongGroup {
                 received: group_id.to_vec(),
             });
         }
 
         if data.len() % 1024 != 0 {
-            return Err(PartialMessageError::InvalidFormat);
+            return Err(PartialError::InvalidFormat);
         }
 
         let mut offset = 0;
@@ -78,7 +75,7 @@ impl Bitmap {
             }
 
             if offset + 1024 > data.len() {
-                return Err(PartialMessageError::InvalidFormat);
+                return Err(PartialError::InvalidFormat);
             }
 
             self.set |= 1 << i;
@@ -101,9 +98,9 @@ impl Metadata for PeerBitmap {
         self.bitmap.as_slice()
     }
 
-    fn update(&mut self, data: &[u8]) -> Result<bool, PartialMessageError> {
+    fn update(&mut self, data: &[u8]) -> Result<bool, PartialError> {
         if data.len() != 1 {
-            return Err(PartialMessageError::InvalidFormat);
+            return Err(PartialError::InvalidFormat);
         }
 
         let before = self.bitmap[0];
@@ -121,14 +118,15 @@ impl Partial for Bitmap {
         [self.set; 1].to_vec()
     }
 
-    fn partial_message_bytes_from_metadata(
+    fn partial_action_from_metadata(
         &self,
+        _peer_id: libp2p::PeerId,
         metadata: Option<&[u8]>,
-    ) -> Result<PublishAction, PartialMessageError> {
+    ) -> Result<PartialAction, PartialError> {
         let metadata = metadata.unwrap_or(&[0u8]);
 
         if metadata.len() != 1 {
-            return Err(PartialMessageError::InvalidFormat);
+            return Err(PartialError::InvalidFormat);
         }
 
         let bitmap = metadata[0];
@@ -161,7 +159,7 @@ impl Partial for Bitmap {
         }
 
         if response_bitmap == 0 {
-            return Ok(PublishAction {
+            return Ok(PartialAction {
                 need: peer_has_useful_data,
                 send: None,
             });
@@ -174,7 +172,7 @@ impl Partial for Bitmap {
             bitmap: [metadata[0] | response_bitmap],
         };
 
-        Ok(PublishAction {
+        Ok(PartialAction {
             need: peer_has_useful_data,
             send: Some((data, Box::new(bitmap))),
         })

gossipsub-interop/rust-libp2p/src/bitmap.rs

@@ -3,7 +3,7 @@ use futures::channel::mpsc;
 use futures::{SinkExt, StreamExt};
 use libp2p::swarm::{NetworkBehaviour, SwarmEvent};
 use libp2p::{identify, Swarm};
-use libp2p_gossipsub::{self as gossipsub, IdentTopic, Partial};
+use libp2p_gossipsub::{self as gossipsub, partial_messages::Partial, IdentTopic};
 use slog::{error, info, Logger};
 use std::collections::HashMap;
 use std::time::{Duration, Instant};
@@ -181,12 +181,12 @@ impl ScriptedNode {
                                             }).await.unwrap();
                                         }
                                     }
-                                    SwarmEvent::Behaviour(MyBehaviorEvent::Gossipsub(gossipsub::Event::Partial {group_id, topic_id, propagation_source, message, metadata })) => {
-                                        info!(self.stdout_logger, "Received partial message for topic {topic_id} and group {group_id:?}");
+                                    SwarmEvent::Behaviour(MyBehaviorEvent::Gossipsub(gossipsub::Event::Partial {group_id, topic_hash, peer_id, message, metadata })) => {
+                                        info!(self.stdout_logger, "Received partial message for topic {topic_hash} and group {group_id:?}");
 
                                         let topic_partials = self
                                             .partials
-                                            .entry(topic_id.to_string())
+                                            .entry(topic_hash.to_string())
                                             .or_default();
                                         let group_id_array: [u8; 8] = group_id
                                             .as_slice()
@@ -212,7 +212,7 @@ impl ScriptedNode {
                                                 info!(self.stdout_logger, "All parts received";
                                                     // "topic" => topic_id,
                                                     // "group_id" => group_id,
-                                                    "from" => propagation_source.to_string());
+                                                    "from" => peer_id.to_string());
                                             }
 
                                             should_republish = true;
@@ -228,7 +228,7 @@ impl ScriptedNode {
                                             self.swarm
                                                 .behaviour_mut()
                                                 .gossipsub
-                                                .publish_partial(topic_id, partial.clone())?;
+                                                .publish_partial(topic_hash, partial.clone())?;
                                         }
                                     }
                                     ev => {
@@ -277,7 +277,7 @@ impl ScriptedNode {
                     .swarm
                     .behaviour_mut()
                     .gossipsub
-                    .subscribe(&topic, partial, partial)
+                    .subscribe_partial(&topic, partial)
                 {
                     Ok(_) => {
                         info!(self.stderr_logger, "Subscribed to topic {}", topic_id);