move connection ID generation from the utils to the protocol package

client.go

@@ -44,7 +44,7 @@ type client struct {
 
 var (
 	// make it possible to mock connection ID generation in the tests
-	generateConnectionID         = utils.GenerateConnectionID
+	generateConnectionID         = protocol.GenerateConnectionID
 	errCloseSessionForNewVersion = errors.New("closing session in order to recreate it with a new version")
 )
 
@@ -384,7 +384,7 @@ func (c *client) handleVersionNegotiationPacket(hdr *wire.Header) error {
 	c.initialVersion = c.version
 	c.version = newVersion
 	var err error
-	c.connectionID, err = utils.GenerateConnectionID()
+	c.connectionID, err = protocol.GenerateConnectionID()
 	if err != nil {
 		return err
 	}

internal/protocol/connection_id.go

@@ -1,18 +1,19 @@
-package utils
+package protocol
 
 import (
 	"crypto/rand"
 	"encoding/binary"
-
-	"github.com/lucas-clemente/quic-go/internal/protocol"
 )
 
+// A ConnectionID in QUIC
+type ConnectionID uint64
+
 // GenerateConnectionID generates a connection ID using cryptographic random
-func GenerateConnectionID() (protocol.ConnectionID, error) {
+func GenerateConnectionID() (ConnectionID, error) {
 	b := make([]byte, 8)
 	_, err := rand.Read(b)
 	if err != nil {
 		return 0, err
 	}
-	return protocol.ConnectionID(binary.LittleEndian.Uint64(b)), nil
+	return ConnectionID(binary.LittleEndian.Uint64(b)), nil
 }

internal/protocol/connection_id_test.go

@@ -1,4 +1,4 @@
-package utils
+package protocol
 
 import (
 	. "github.com/onsi/ginkgo"

internal/protocol/protocol.go

@@ -52,9 +52,6 @@ func (t PacketType) String() string {
 	}
 }
 
-// A ConnectionID in QUIC
-type ConnectionID uint64
-
 // A ByteCount in QUIC
 type ByteCount uint64