From 126db938d03d66f8a3e0f2231f8d8546cb107815 Mon Sep 17 00:00:00 2001
From: Lucas Clemente <lucas@clemente.io>
Date: Tue, 23 Aug 2016 12:24:33 +0200
Subject: [PATCH] fix some linter warnings

---
 frames/ack_frame.go                             | 9 ++++-----
 handshake/connection_parameters_manager.go      | 2 +-
 handshake/connection_parameters_manager_test.go | 2 +-
 handshake/handshake_message.go                  | 2 +-
 protocol/protocol.go                            | 2 +-
 qerr/errorcode_string.go                        | 2 +-
 utils/utils.go                                  | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/frames/ack_frame.go b/frames/ack_frame.go
index 724585ab1..f96e38c63 100644
--- a/frames/ack_frame.go
+++ b/frames/ack_frame.go
@@ -159,12 +159,11 @@ func ParseAckFrame(r *bytes.Reader, version protocol.VersionNumber) (*AckFrame,
 		return nil, ErrInvalidAckRanges
 	}
 
-	var numTimestampByte byte
-	numTimestampByte, err = r.ReadByte()
+	var numTimestamp byte
+	numTimestamp, err = r.ReadByte()
 	if err != nil {
 		return nil, err
 	}
-	numTimestamp := uint8(numTimestampByte)
 
 	if numTimestamp > 0 {
 		// Delta Largest acked
@@ -309,7 +308,7 @@ func (f *AckFrame) Write(b *bytes.Buffer, version protocol.VersionNumber) error
 					gapWritten = 0xFF
 				}
 
-				b.WriteByte(uint8(gapWritten))
+				b.WriteByte(gapWritten)
 				switch missingSequenceNumberDeltaLen {
 				case protocol.PacketNumberLen1:
 					b.WriteByte(uint8(lengthWritten))
@@ -318,7 +317,7 @@ func (f *AckFrame) Write(b *bytes.Buffer, version protocol.VersionNumber) error
 				case protocol.PacketNumberLen4:
 					utils.WriteUint32(b, uint32(lengthWritten))
 				case protocol.PacketNumberLen6:
-					utils.WriteUint48(b, uint64(lengthWritten))
+					utils.WriteUint48(b, lengthWritten)
 				}
 
 				numRangesWritten++
diff --git a/handshake/connection_parameters_manager.go b/handshake/connection_parameters_manager.go
index 820c12691..87d42b03a 100644
--- a/handshake/connection_parameters_manager.go
+++ b/handshake/connection_parameters_manager.go
@@ -129,7 +129,7 @@ func (h *ConnectionParametersManager) GetSHLOMap() map[Tag][]byte {
 	cfcw := bytes.NewBuffer([]byte{})
 	utils.WriteUint32(cfcw, uint32(h.GetReceiveConnectionFlowControlWindow()))
 	mspc := bytes.NewBuffer([]byte{})
-	utils.WriteUint32(mspc, uint32(h.GetMaxStreamsPerConnection()))
+	utils.WriteUint32(mspc, h.GetMaxStreamsPerConnection())
 	icsl := bytes.NewBuffer([]byte{})
 	utils.WriteUint32(icsl, uint32(h.GetIdleConnectionStateLifetime()/time.Second))
 
diff --git a/handshake/connection_parameters_manager_test.go b/handshake/connection_parameters_manager_test.go
index d3f8ec858..e9249afde 100644
--- a/handshake/connection_parameters_manager_test.go
+++ b/handshake/connection_parameters_manager_test.go
@@ -154,7 +154,7 @@ var _ = Describe("ConnectionsParameterManager", func() {
 	})
 
 	Context("idle connection state lifetime", func() {
-		It("has initial idle conneciton state lifetime", func() {
+		It("has initial idle connection state lifetime", func() {
 			Expect(cpm.GetIdleConnectionStateLifetime()).To(Equal(protocol.InitialIdleConnectionStateLifetime))
 		})
 
diff --git a/handshake/handshake_message.go b/handshake/handshake_message.go
index e43db23ea..d462024c5 100644
--- a/handshake/handshake_message.go
+++ b/handshake/handshake_message.go
@@ -39,7 +39,7 @@ func ParseHandshakeMessage(r utils.ReadStream) (Tag, map[Tag][]byte, error) {
 	var dataStart uint32
 	for indexPos := 0; indexPos < int(nPairs)*8; indexPos += 8 {
 		tag := Tag(binary.LittleEndian.Uint32(index[indexPos : indexPos+4]))
-		dataEnd := uint32(binary.LittleEndian.Uint32(index[indexPos+4 : indexPos+8]))
+		dataEnd := binary.LittleEndian.Uint32(index[indexPos+4 : indexPos+8])
 
 		dataLen := dataEnd - dataStart
 		if dataLen > protocol.CryptoParameterMaxLength {
diff --git a/protocol/protocol.go b/protocol/protocol.go
index 5bf071486..90f50642a 100644
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -62,5 +62,5 @@ const DefaultRetransmissionTime = 500 * time.Millisecond
 // MinRetransmissionTime is the minimum RTO time
 const MinRetransmissionTime = 200 * time.Millisecond
 
-// ClientHelloMinimumSize is the minimum size the server expectes an inchoate CHLO to have.
+// ClientHelloMinimumSize is the minimum size the server expects an inchoate CHLO to have.
 const ClientHelloMinimumSize = 1024
diff --git a/qerr/errorcode_string.go b/qerr/errorcode_string.go
index 50141c67b..aadd65760 100644
--- a/qerr/errorcode_string.go
+++ b/qerr/errorcode_string.go
@@ -23,7 +23,7 @@ var (
 func (i ErrorCode) String() string {
 	switch {
 	case 1 <= i && i <= 14:
-		i -= 1
+		i--
 		return _ErrorCode_name_0[_ErrorCode_index_0[i]:_ErrorCode_index_0[i+1]]
 	case 16 <= i && i <= 20:
 		i -= 16
diff --git a/utils/utils.go b/utils/utils.go
index dcaf9f851..197d59237 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -167,7 +167,7 @@ func WriteUint16(b *bytes.Buffer, i uint16) {
 func RandomBit() (bool, error) {
 	b := make([]byte, 1)
 	_, err := rand.Read(b)
-	return uint8(b[0])%2 == 0, err
+	return b[0]%2 == 0, err
 }
 
 // Uint32Slice attaches the methods of sort.Interface to []uint32, sorting in increasing order.