From 6b22f36d82ffb8fd8e188ae587f8902734ede008 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 13 Sep 2019 13:53:21 +0700 Subject: [PATCH] add the stylecheck linter --- .golangci.yml | 1 + client.go | 1 + frame_sorter.go | 4 ++-- frame_sorter_test.go | 2 +- integrationtests/self/cancelation_test.go | 12 ++++++------ integrationtests/tools/testlog/testlog.go | 2 ++ integrationtests/tools/testserver/server.go | 2 ++ internal/handshake/token_protector.go | 2 +- internal/handshake/token_protector_test.go | 2 +- internal/wire/header.go | 2 ++ internal/wire/new_connection_id_frame.go | 1 + internal/wire/new_token_frame.go | 2 +- internal/wire/new_token_frame_test.go | 2 +- packet_unpacker.go | 1 + quictrace/tracer.go | 2 +- receive_stream.go | 2 +- receive_stream_test.go | 4 ++-- send_stream.go | 2 +- send_stream_test.go | 4 ++-- 19 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 95a8e5e2..52c0a365 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -19,6 +19,7 @@ linters: - prealloc - scopelint - staticcheck + - stylecheck - structcheck - unconvert - unparam diff --git a/client.go b/client.go index 9cd9390b..02e2619d 100644 --- a/client.go +++ b/client.go @@ -341,6 +341,7 @@ func (c *client) handleVersionNegotiationPacket(p *receivedPacket) { c.logger.Infof("Received a Version Negotiation packet. Supported Versions: %s", hdr.SupportedVersions) newVersion, ok := protocol.ChooseSupportedVersion(c.config.Versions, hdr.SupportedVersions) if !ok { + //nolint:stylecheck c.session.destroy(fmt.Errorf("No compatible QUIC version found. We support %s, server offered %s", c.config.Versions, hdr.SupportedVersions)) c.logger.Debugf("No compatible QUIC version found.") return diff --git a/frame_sorter.go b/frame_sorter.go index dee0a445..f2fc6986 100644 --- a/frame_sorter.go +++ b/frame_sorter.go @@ -18,7 +18,7 @@ type frameSorter struct { gaps *utils.ByteIntervalList } -var errDuplicateStreamData = errors.New("Duplicate Stream Data") +var errDuplicateStreamData = errors.New("duplicate stream data") func newFrameSorter() *frameSorter { s := frameSorter{ @@ -146,7 +146,7 @@ func (s *frameSorter) push(data []byte, offset protocol.ByteCount, doneCb func() } if s.gaps.Len() > protocol.MaxStreamFrameSorterGaps { - return errors.New("Too many gaps in received data") + return errors.New("too many gaps in received data") } if wasCut && len(data) < protocol.MinStreamFrameBufferSize { diff --git a/frame_sorter_test.go b/frame_sorter_test.go index 4a2aa1bc..de20bf2d 100644 --- a/frame_sorter_test.go +++ b/frame_sorter_test.go @@ -555,7 +555,7 @@ var _ = Describe("frame sorter", func() { } Expect(s.gaps.Len()).To(Equal(protocol.MaxStreamFrameSorterGaps)) err := s.Push([]byte("foobar"), protocol.ByteCount(protocol.MaxStreamFrameSorterGaps*7)+100, nil) - Expect(err).To(MatchError("Too many gaps in received data")) + Expect(err).To(MatchError("too many gaps in received data")) }) }) }) diff --git a/integrationtests/self/cancelation_test.go b/integrationtests/self/cancelation_test.go index 72bb97cd..22115b16 100644 --- a/integrationtests/self/cancelation_test.go +++ b/integrationtests/self/cancelation_test.go @@ -44,7 +44,7 @@ var _ = Describe("Stream Cancelations", func() { str, err := sess.OpenUniStreamSync(context.Background()) Expect(err).ToNot(HaveOccurred()) if _, err = str.Write(testserver.PRData); err != nil { - Expect(err).To(MatchError(fmt.Sprintf("Stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) + Expect(err).To(MatchError(fmt.Sprintf("stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) atomic.AddInt32(&canceledCounter, 1) return } @@ -174,7 +174,7 @@ var _ = Describe("Stream Cancelations", func() { data, err := ioutil.ReadAll(str) if err != nil { atomic.AddInt32(&counter, 1) - Expect(err).To(MatchError(fmt.Sprintf("Stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) + Expect(err).To(MatchError(fmt.Sprintf("stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) return } Expect(data).To(Equal(testserver.PRData)) @@ -281,7 +281,7 @@ var _ = Describe("Stream Cancelations", func() { return } if _, err = str.Write(testserver.PRData); err != nil { - Expect(err).To(MatchError(fmt.Sprintf("Stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) + Expect(err).To(MatchError(fmt.Sprintf("stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) return } Expect(str.Close()).To(Succeed()) @@ -314,7 +314,7 @@ var _ = Describe("Stream Cancelations", func() { } data, err := ioutil.ReadAll(str) if err != nil { - Expect(err).To(MatchError(fmt.Sprintf("Stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) + Expect(err).To(MatchError(fmt.Sprintf("stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) return } atomic.AddInt32(&counter, 1) @@ -355,7 +355,7 @@ var _ = Describe("Stream Cancelations", func() { length = int(rand.Int31n(int32(len(testserver.PRData) - 1))) } if _, err = str.Write(testserver.PRData[:length]); err != nil { - Expect(err).To(MatchError(fmt.Sprintf("Stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) + Expect(err).To(MatchError(fmt.Sprintf("stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) return } if length < len(testserver.PRData) { @@ -396,7 +396,7 @@ var _ = Describe("Stream Cancelations", func() { } data, err := ioutil.ReadAll(r) if err != nil { - Expect(err).To(MatchError(fmt.Sprintf("Stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) + Expect(err).To(MatchError(fmt.Sprintf("stream %d was reset with error code %d", str.StreamID(), str.StreamID()))) return } Expect(data).To(Equal(testserver.PRData[:length])) diff --git a/integrationtests/tools/testlog/testlog.go b/integrationtests/tools/testlog/testlog.go index 0632ab76..07e24292 100644 --- a/integrationtests/tools/testlog/testlog.go +++ b/integrationtests/tools/testlog/testlog.go @@ -9,7 +9,9 @@ import ( "github.com/lucas-clemente/quic-go/internal/utils" + //nolint:stylecheck . "github.com/onsi/ginkgo" + //nolint:stylecheck . "github.com/onsi/gomega" ) diff --git a/integrationtests/tools/testserver/server.go b/integrationtests/tools/testserver/server.go index 7fe0a4fd..622ac946 100644 --- a/integrationtests/tools/testserver/server.go +++ b/integrationtests/tools/testserver/server.go @@ -12,7 +12,9 @@ import ( "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/testdata" + //nolint:stylecheck . "github.com/onsi/ginkgo" + //nolint:stylecheck . "github.com/onsi/gomega" ) diff --git a/internal/handshake/token_protector.go b/internal/handshake/token_protector.go index 238b984d..33d18e60 100644 --- a/internal/handshake/token_protector.go +++ b/internal/handshake/token_protector.go @@ -54,7 +54,7 @@ func (s *tokenProtectorImpl) NewToken(data []byte) ([]byte, error) { // DecodeToken decodes a token. func (s *tokenProtectorImpl) DecodeToken(p []byte) ([]byte, error) { if len(p) < tokenNonceSize { - return nil, fmt.Errorf("Token too short: %d", len(p)) + return nil, fmt.Errorf("token too short: %d", len(p)) } nonce := p[:tokenNonceSize] aead, aeadNonce, err := s.createAEAD(nonce) diff --git a/internal/handshake/token_protector_test.go b/internal/handshake/token_protector_test.go index a22fe1d6..53bae6ed 100644 --- a/internal/handshake/token_protector_test.go +++ b/internal/handshake/token_protector_test.go @@ -34,6 +34,6 @@ var _ = Describe("Token Protector", func() { It("errors when decoding too short tokens", func() { _, err := tp.DecodeToken([]byte("foobar")) - Expect(err).To(MatchError("Token too short: 6")) + Expect(err).To(MatchError("token too short: 6")) }) }) diff --git a/internal/wire/header.go b/internal/wire/header.go index 061efc85..0cffb8c6 100644 --- a/internal/wire/header.go +++ b/internal/wire/header.go @@ -215,9 +215,11 @@ func (h *Header) parseLongHeader(b *bytes.Reader) error { func (h *Header) parseVersionNegotiationPacket(b *bytes.Reader) error { if b.Len() == 0 { + //nolint:stylecheck return errors.New("Version Negotiation packet has empty version list") } if b.Len()%4 != 0 { + //nolint:stylecheck return errors.New("Version Negotiation packet has a version list with an invalid length") } h.SupportedVersions = make([]protocol.VersionNumber, b.Len()/4) diff --git a/internal/wire/new_connection_id_frame.go b/internal/wire/new_connection_id_frame.go index 59094744..78735b27 100644 --- a/internal/wire/new_connection_id_frame.go +++ b/internal/wire/new_connection_id_frame.go @@ -32,6 +32,7 @@ func parseNewConnectionIDFrame(r *bytes.Reader, _ protocol.VersionNumber) (*NewC return nil, err } if ret > seq { + //nolint:stylecheck return nil, fmt.Errorf("Retire Prior To value (%d) larger than Sequence Number (%d)", ret, seq) } connIDLen, err := r.ReadByte() diff --git a/internal/wire/new_token_frame.go b/internal/wire/new_token_frame.go index a79c38c5..9a66355e 100644 --- a/internal/wire/new_token_frame.go +++ b/internal/wire/new_token_frame.go @@ -26,7 +26,7 @@ func parseNewTokenFrame(r *bytes.Reader, _ protocol.VersionNumber) (*NewTokenFra return nil, io.EOF } if tokenLen == 0 { - return nil, errors.New("Token must not be empty.") + return nil, errors.New("token must not be empty") } token := make([]byte, int(tokenLen)) if _, err := io.ReadFull(r, token); err != nil { diff --git a/internal/wire/new_token_frame_test.go b/internal/wire/new_token_frame_test.go index c23e0a08..6ba92a93 100644 --- a/internal/wire/new_token_frame_test.go +++ b/internal/wire/new_token_frame_test.go @@ -29,7 +29,7 @@ var _ = Describe("NEW_TOKEN frame", func() { data = append(data, encodeVarInt(uint64(0))...) b := bytes.NewReader(data) _, err := parseNewTokenFrame(b, protocol.VersionWhatever) - Expect(err).To(MatchError("Token must not be empty.")) + Expect(err).To(MatchError("token must not be empty")) }) It("errors on EOFs", func() { diff --git a/packet_unpacker.go b/packet_unpacker.go index 87d56faf..0736d86a 100644 --- a/packet_unpacker.go +++ b/packet_unpacker.go @@ -139,6 +139,7 @@ func (u *packetUnpacker) unpack(hd headerDecryptor, hdr *wire.Header, data []byt hdrLen := int(hdr.ParsedLen()) if len(data) < hdrLen+4+16 { + //nolint:stylecheck return nil, fmt.Errorf("Packet too small. Expected at least 20 bytes after the header, got %d", len(data)-hdrLen) } // The packet number can be up to 4 bytes long, but we won't know the length until we decrypt it. diff --git a/quictrace/tracer.go b/quictrace/tracer.go index c74404bd..796e132b 100644 --- a/quictrace/tracer.go +++ b/quictrace/tracer.go @@ -70,7 +70,7 @@ func (t *tracer) Emit(connID protocol.ConnectionID) ([]byte, error) { func (t *tracer) emitByConnIDAsString(connID string) ([]byte, error) { events, ok := t.events[connID] if !ok { - return nil, fmt.Errorf("No trace found for connection ID %s", connID) + return nil, fmt.Errorf("no trace found for connection ID %s", connID) } trace := &pb.Trace{ DestinationConnectionId: []byte{1, 2, 3, 4, 5, 6, 7, 8}, diff --git a/receive_stream.go b/receive_stream.go index 04338f65..491cd85b 100644 --- a/receive_stream.go +++ b/receive_stream.go @@ -276,7 +276,7 @@ func (s *receiveStream) handleResetStreamFrameImpl(frame *wire.ResetStreamFrame) s.resetRemotely = true s.resetRemotelyErr = streamCanceledError{ errorCode: frame.ErrorCode, - error: fmt.Errorf("Stream %d was reset with error code %d", s.streamID, frame.ErrorCode), + error: fmt.Errorf("stream %d was reset with error code %d", s.streamID, frame.ErrorCode), } s.signalRead() return true, nil diff --git a/receive_stream_test.go b/receive_stream_test.go index 3e4e347f..2ca9d9ed 100644 --- a/receive_stream_test.go +++ b/receive_stream_test.go @@ -552,7 +552,7 @@ var _ = Describe("Receive Stream", func() { go func() { defer GinkgoRecover() _, err := strWithTimeout.Read([]byte{0}) - Expect(err).To(MatchError("Stream 1337 was reset with error code 1234")) + Expect(err).To(MatchError("stream 1337 was reset with error code 1234")) Expect(err).To(BeAssignableToTypeOf(streamCanceledError{})) Expect(err.(streamCanceledError).Canceled()).To(BeTrue()) Expect(err.(streamCanceledError).ErrorCode()).To(Equal(protocol.ApplicationErrorCode(1234))) @@ -576,7 +576,7 @@ var _ = Describe("Receive Stream", func() { ) Expect(str.handleResetStreamFrame(rst)).To(Succeed()) _, err := strWithTimeout.Read([]byte{0}) - Expect(err).To(MatchError("Stream 1337 was reset with error code 1234")) + Expect(err).To(MatchError("stream 1337 was reset with error code 1234")) Expect(err).To(BeAssignableToTypeOf(streamCanceledError{})) Expect(err.(streamCanceledError).Canceled()).To(BeTrue()) Expect(err.(streamCanceledError).ErrorCode()).To(Equal(protocol.ApplicationErrorCode(1234))) diff --git a/send_stream.go b/send_stream.go index c2e1aa7d..b15fd082 100644 --- a/send_stream.go +++ b/send_stream.go @@ -366,7 +366,7 @@ func (s *sendStream) handleMaxStreamDataFrame(frame *wire.MaxStreamDataFrame) { func (s *sendStream) handleStopSendingFrame(frame *wire.StopSendingFrame) { writeErr := streamCanceledError{ errorCode: frame.ErrorCode, - error: fmt.Errorf("Stream %d was reset with error code %d", s.streamID, frame.ErrorCode), + error: fmt.Errorf("stream %d was reset with error code %d", s.streamID, frame.ErrorCode), } s.cancelWriteImpl(frame.ErrorCode, writeErr) } diff --git a/send_stream_test.go b/send_stream_test.go index e15eb5f3..911d4aca 100644 --- a/send_stream_test.go +++ b/send_stream_test.go @@ -641,7 +641,7 @@ var _ = Describe("Send Stream", func() { go func() { defer GinkgoRecover() _, err := str.Write([]byte("foobar")) - Expect(err).To(MatchError("Stream 1337 was reset with error code 123")) + Expect(err).To(MatchError("stream 1337 was reset with error code 123")) Expect(err).To(BeAssignableToTypeOf(streamCanceledError{})) Expect(err.(streamCanceledError).Canceled()).To(BeTrue()) Expect(err.(streamCanceledError).ErrorCode()).To(Equal(protocol.ApplicationErrorCode(123))) @@ -663,7 +663,7 @@ var _ = Describe("Send Stream", func() { ErrorCode: 123, }) _, err := str.Write([]byte("foobar")) - Expect(err).To(MatchError("Stream 1337 was reset with error code 123")) + Expect(err).To(MatchError("stream 1337 was reset with error code 123")) Expect(err).To(BeAssignableToTypeOf(streamCanceledError{})) Expect(err.(streamCanceledError).Canceled()).To(BeTrue()) Expect(err.(streamCanceledError).ErrorCode()).To(Equal(protocol.ApplicationErrorCode(123)))