Fix TestWebsocketVoteCompression

Author: cce

network/msgCompressor.go

@@ -159,7 +159,8 @@ func makeWsPeerMsgDataDecoder(wp *wsPeer) *wsPeerMsgDataDecoder {
 	}
 
 	c.ppdec = zstdProposalDecompressor{}
-	if wp.vpackVoteCompressionSupported() {
+	// have both ends advertised support for compression?
+	if wp.enableVoteCompression && wp.vpackVoteCompressionSupported() {
 		c.avdec = vpackVoteDecompressor{
 			enabled: true,
 			dec:     vpack.NewStatelessDecoder(),

network/wsNetwork.go

@@ -1042,18 +1042,19 @@ func (wn *WebsocketNetwork) ServeHTTP(response http.ResponseWriter, request *htt
 
 	client, _ := wn.GetHTTPClient(trackedRequest.remoteAddress())
 	peer := &wsPeer{
-		wsPeerCore:        makePeerCore(wn.ctx, wn, wn.log, wn.handler.readBuffer, trackedRequest.remoteAddress(), client, trackedRequest.remoteHost),
-		conn:              wsPeerWebsocketConnImpl{conn},
-		outgoing:          false,
-		InstanceName:      trackedRequest.otherInstanceName,
-		incomingMsgFilter: wn.incomingMsgFilter,
-		prioChallenge:     challenge,
-		createTime:        trackedRequest.created,
-		version:           matchingVersion,
-		identity:          peerID,
-		identityChallenge: peerIDChallenge,
-		identityVerified:  atomic.Uint32{},
-		features:          decodePeerFeatures(matchingVersion, request.Header.Get(PeerFeaturesHeader)),
+		wsPeerCore:            makePeerCore(wn.ctx, wn, wn.log, wn.handler.readBuffer, trackedRequest.remoteAddress(), client, trackedRequest.remoteHost),
+		conn:                  wsPeerWebsocketConnImpl{conn},
+		outgoing:              false,
+		InstanceName:          trackedRequest.otherInstanceName,
+		incomingMsgFilter:     wn.incomingMsgFilter,
+		prioChallenge:         challenge,
+		createTime:            trackedRequest.created,
+		version:               matchingVersion,
+		identity:              peerID,
+		identityChallenge:     peerIDChallenge,
+		identityVerified:      atomic.Uint32{},
+		features:              decodePeerFeatures(matchingVersion, request.Header.Get(PeerFeaturesHeader)),
+		enableVoteCompression: wn.config.EnableVoteCompression,
 	}
 	peer.TelemetryGUID = trackedRequest.otherTelemetryGUID
 	peer.init(wn.config, wn.outgoingMessagesBufferSize)
@@ -1394,6 +1395,8 @@ func (wn *msgBroadcaster) innerBroadcast(request broadcastRequest, prio bool, pe
 			continue
 		}
 		dataToSend := data
+		// check whether to send a compressed vote. dataWithCompression will be empty if this node
+		// has not enabled vote compression.
 		if peer.vpackVoteCompressionSupported() && len(dataWithCompression) > 0 {
 			dataToSend = dataWithCompression
 		}
@@ -2148,6 +2151,7 @@ func (wn *WebsocketNetwork) tryConnect(netAddr, gossipAddr string) {
 		version:                     matchingVersion,
 		identity:                    peerID,
 		features:                    decodePeerFeatures(matchingVersion, response.Header.Get(PeerFeaturesHeader)),
+		enableVoteCompression:       wn.config.EnableVoteCompression,
 	}
 	peer.TelemetryGUID, peer.InstanceName, _ = getCommonHeaders(response.Header)
 

network/wsNetwork_test.go

@@ -507,14 +507,18 @@ func TestWebsocketVoteCompression(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(fmt.Sprintf("A_compression_%v+B_compression_%v", test.netAEnableCompression, test.netBEnableCompression), func(t *testing.T) {
-			netA := makeTestWebsocketNode(t)
-			netA.config.GossipFanout = 1
-			netA.config.EnableVoteCompression = test.netAEnableCompression
+			cfgA := defaultConfig
+			cfgA.GossipFanout = 1
+			cfgA.EnableVoteCompression = test.netAEnableCompression
+			netA := makeTestWebsocketNodeWithConfig(t, cfgA)
 			netA.Start()
 			defer netStop(t, netA, "A")
-			netB := makeTestWebsocketNode(t)
-			netB.config.GossipFanout = 1
-			netB.config.EnableVoteCompression = test.netBEnableCompression
+
+			cfgB := defaultConfig
+			cfgB.GossipFanout = 1
+			cfgB.EnableVoteCompression = test.netBEnableCompression
+			netB := makeTestWebsocketNodeWithConfig(t, cfgB)
+
 			addrA, postListen := netA.Address()
 			require.True(t, postListen)
 			t.Log(addrA)
@@ -527,7 +531,7 @@ func TestWebsocketVoteCompression(t *testing.T) {
 				"r":    map[string]any{"rnd": uint64(2), "snd": [32]byte{3}},
 				"sig": map[string]any{
 					"p": [32]byte{4}, "p1s": [64]byte{5}, "p2": [32]byte{6},
-					"p2s": [64]byte{7}, "ps": [64]byte{8}, "s": [64]byte{9},
+					"p2s": [64]byte{7}, "ps": [64]byte{}, "s": [64]byte{9},
 				},
 			}
 			vote2 := map[string]any{

network/wsPeer.go

@@ -238,6 +238,9 @@ type wsPeer struct {
 	// peer features derived from the peer version
 	features peerFeatureFlag
 
+	// enableCompression specifies whether this node can compress or decompress votes (and whether it has advertised this)
+	enableVoteCompression bool
+
 	// responseChannels used by the client to wait on the response of the request
 	responseChannels map[uint64]chan *Response
 

network/wsPeer_test.go

@@ -166,6 +166,8 @@ func TestVersionToFeature(t *testing.T) {
 		{"2.2", PeerFeatureProposalCompression, pfCompressedProposal},
 		{"2.2", strings.Join([]string{PeerFeatureProposalCompression, "test"}, ","), pfCompressedProposal},
 		{"2.2", strings.Join([]string{PeerFeatureProposalCompression, "test"}, ", "), pfCompressedProposal},
+		{"2.2", strings.Join([]string{PeerFeatureProposalCompression, PeerFeatureVoteVpackCompression}, ","), pfCompressedVoteVpack | pfCompressedProposal},
+		{"2.2", PeerFeatureVoteVpackCompression, pfCompressedVoteVpack},
 		{"2.3", PeerFeatureProposalCompression, pfCompressedProposal},
 	}
 	for i, test := range tests {