gossipsub-interop: update go-libp2p to the latest version

Author: sukunrt

gossipsub-interop/go-libp2p/go.mod

@@ -110,3 +110,5 @@ require (
 	google.golang.org/protobuf v1.36.5 // indirect
 	lukechampine.com/blake3 v1.4.1 // indirect
 )
+
+replace github.com/libp2p/go-libp2p-pubsub => /home/sukun/dev/go-libp2p-pubsub

gossipsub-interop/go-libp2p/main.go

@@ -18,6 +18,7 @@ import (
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p-pubsub/partialmessages"
 	pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb"
+	"github.com/libp2p/go-libp2p/core/connmgr"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -120,6 +121,7 @@ func main() {
 		libp2p.ListenAddrStrings("/ip4/0.0.0.0/tcp/9000"),
 		// libp2p.ListenAddrStrings("/ip4/0.0.0.0/udp/9000/quic-v1"),
 		libp2p.Identity(nodePrivKey(nodeId)),
+		libp2p.ConnectionManager(connmgr.NullConnMgr{}),
 	)
 	if err != nil {
 		panic(err)

gossipsub-interop/go-libp2p/partial.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"math/bits"
 
-	partialmessages "github.com/libp2p/go-libp2p-pubsub/partialmessages"
+	"github.com/libp2p/go-libp2p-pubsub/partialmessages"
 )
 
 const partLen = 1024
@@ -17,8 +17,8 @@ type PartialMessage struct {
 }
 
 // PartsMetadata implements partialmessages.PartialMessage.
-func (p *PartialMessage) PartsMetadata() []byte {
-	out := []byte{0}
+func (p *PartialMessage) PartsMetadata() partialmessages.PartsMetadata {
+	out := partialmessages.PartsMetadata{0}
 	for i := range p.parts {
 		if len(p.parts[i]) > 0 {
 			out[0] |= 1 << i
@@ -88,35 +88,29 @@ func (p *PartialMessage) Extend(data []byte) error {
 }
 
 // PartialMessageBytes implements partialmessages.PartialMessage.
-func (p *PartialMessage) PartialMessageBytes(metadata []byte) ([]byte, []byte, error) {
+func (p *PartialMessage) PartialMessageBytes(metadata partialmessages.PartsMetadata) ([]byte, error) {
 	if len(metadata) != 1 {
-		return nil, nil, errors.New("invalid metadata length")
+		return nil, errors.New("invalid metadata length")
 	}
 
 	out := make([]byte, 0, 1+1024*(bits.OnesCount8(metadata[0]))+len(p.groupID))
 	out = append(out, 0) // This byte will contain the parts we are including in the message
-	remaining := []byte{metadata[0]}
-	for i := range p.parts {
+	for i, a := range p.parts {
 		if metadata[0]&(1<<i) != 0 {
 			// They already have this part
 			continue
 		}
-		if len(p.parts[i]) == 0 {
+		if len(a) == 0 {
 			continue
 		}
-		remaining[0] ^= (1 << i)
 		out[0] |= 1 << i
-		out = append(out, p.parts[i]...)
+		out = append(out, a...)
 	}
 	if out[0] == 0 {
-		return nil, metadata, nil
+		return nil, nil
 	}
 	out = append(out, p.groupID[:]...)
-	if remaining[0] == 0 {
-		remaining = nil
-	}
-
-	return out, remaining, nil
+	return out, nil
 }
 
-var _ partialmessages.PartialMessage = (*PartialMessage)(nil)
+var _ partialmessages.Message = (*PartialMessage)(nil)

gossipsub-interop/go-libp2p/partial_test.go

@@ -94,11 +94,22 @@ func (p *partialInvariantChecker) SplitIntoParts(in *PartialMessage) ([]*Partial
 }
 
 // ShouldRequest implements partialmessages.InvariantChecker.
-func (p *partialInvariantChecker) ShouldRequest(a *PartialMessage, from peer.ID, partsMetadata []byte) bool {
+func (*partialInvariantChecker) ShouldRequest(a *PartialMessage, _ peer.ID, partsMetadata []byte) bool {
 	aHas := a.PartsMetadata()[0]
 	return len(partsMetadata) == 1 && aHas != partsMetadata[0]
 }
 
+func (*partialInvariantChecker) MergePartsMetadata(left, right partialmessages.PartsMetadata) partialmessages.PartsMetadata {
+	res := slices.Clone(left)
+	if len(res) == 0 {
+		return slices.Clone(right)
+	}
+	if len(right) > 0 {
+		res[0] |= right[0]
+	}
+	return res
+}
+
 var _ partialmessages.InvariantChecker[*PartialMessage] = (*partialInvariantChecker)(nil)
 
 func TestPartialMessageInvariants(t *testing.T) {