fix errors.As check on *voteCompressionError

Author: cce

network/msgCompressor.go

@@ -43,8 +43,8 @@ const voteCompressionAbortMessage byte = 0xFF
 // This error type signals that an abort message should be sent to the peer.
 type voteCompressionError struct{ err error }
 
-func (e voteCompressionError) Error() string { return e.err.Error() }
-func (e voteCompressionError) Unwrap() error { return e.err }
+func (e *voteCompressionError) Error() string { return e.err.Error() }
+func (e *voteCompressionError) Unwrap() error { return e.err }
 
 // zstdCompressMsg returns a concatenation of a tag and compressed data
 func zstdCompressMsg(tbytes []byte, d []byte) ([]byte, string) {

network/wsNetwork_test.go

@@ -697,17 +697,22 @@ func TestWebsocketVoteDynamicCompressionAbortMessage(t *testing.T) {
 	require.True(t, peerBtoA.msgCodec.statefulVoteEncEnabled.Load(), "VP encoding not established on B->A")
 	require.True(t, peerBtoA.msgCodec.statefulVoteDecEnabled.Load(), "VP decoding not established on B->A")
 
-	// Send VP abort message from A to B
-	abortMsg := append([]byte(protocol.VotePackedTag), voteCompressionAbortMessage)
-	sent := peerAtoB.writeNonBlock(context.Background(), abortMsg, true, crypto.Digest{}, time.Now())
-	require.True(t, sent, "failed to send abort message")
+	// Send a malformed VP message from B to A to trigger decoder failure and abort handshake.
+	malformedVP := append([]byte(protocol.VotePackedTag), []byte{0x01, 0xFF, 0x42}...)
+	sent := peerBtoA.writeNonBlock(context.Background(), malformedVP, true, crypto.Digest{}, time.Now())
+	require.True(t, sent, "failed to enqueue malformed VP message")
 
-	// Wait for abort to be processed - verify B disabled its encoder (can't send VP to A anymore)
+	// Decoder on A should disable itself after the malformed vote.
+	require.Eventually(t, func() bool {
+		return !peerAtoB.msgCodec.statefulVoteDecEnabled.Load()
+	}, 2*time.Second, 50*time.Millisecond, "VP decoding not disabled on A->B after malformed VP")
+
+	// Encoder on B should see the abort and disable as well.
 	require.Eventually(t, func() bool {
 		return !peerBtoA.msgCodec.statefulVoteEncEnabled.Load()
-	}, 2*time.Second, 50*time.Millisecond, "VP encoding not disabled on B->A after receiving abort message")
+	}, 2*time.Second, 50*time.Millisecond, "VP encoding not disabled on B->A after decoder abort")
 
-	// Verify connection is still up after abort
+	// Verify connection is still up after abort handshake.
 	require.Equal(t, 1, len(netB.peers), "connection should still be alive after abort")
 	require.Equal(t, 1, len(netA.peers), "connection should still be alive after abort")
 }

network/wsPeer.go

@@ -585,7 +585,8 @@ func (wp *wsPeer) readLoop() {
 		msg.Data, err = wp.msgCodec.decompress(msg.Tag, msg.Data)
 		if err != nil {
 			// Handle VP errors by sending abort message and continuing
-			if errors.As(err, &voteCompressionError{}) {
+			var vcErr *voteCompressionError
+			if errors.As(err, &vcErr) {
 				if close, reason := wp.handleVPError(err); close {
 					cleanupCloseError = reason
 					return
@@ -831,7 +832,8 @@ func (wp *wsPeer) writeLoopSendMsg(msg sendMessage) disconnectReason {
 		compressed, err := wp.msgCodec.compress(tag, msg.data)
 		if err != nil {
 			// VP compression error - send abort message then continue with original AV
-			if errors.As(err, &voteCompressionError{}) {
+			var vcErr *voteCompressionError
+			if errors.As(err, &vcErr) {
 				networkVPAbortMessagesSent.Inc(nil)
 				abortMsg := append([]byte(protocol.VotePackedTag), voteCompressionAbortMessage)
 				_ = wp.conn.WriteMessage(websocket.BinaryMessage, abortMsg)