move constants used by the received packet handler to ackhandler package

internal/ackhandler/received_packet_handler.go

@@ -25,11 +25,18 @@ type receivedPacketHandler struct {
 	version protocol.VersionNumber
 }
 
+const (
+	// ackSendDelay is the maximum delay that can be applied to an ACK for a retransmittable packet
+	ackSendDelay = 25 * time.Millisecond
+	// retransmittablePacketsBeforeAck is the number of retransmittable that an ACK is sent for
+	retransmittablePacketsBeforeAck = 10
+)
+
 // NewReceivedPacketHandler creates a new receivedPacketHandler
 func NewReceivedPacketHandler(version protocol.VersionNumber) ReceivedPacketHandler {
 	return &receivedPacketHandler{
 		packetHistory: newReceivedPacketHistory(),
-		ackSendDelay:  protocol.AckSendDelay,
+		ackSendDelay:  ackSendDelay,
 		version:       version,
 	}
 }
@@ -82,7 +89,7 @@ func (h *receivedPacketHandler) maybeQueueAck(packetNumber protocol.PacketNumber
 	}
 
 	if !h.ackQueued && shouldInstigateAck {
-		if h.retransmittablePacketsReceivedSinceLastAck >= protocol.RetransmittablePacketsBeforeAck {
+		if h.retransmittablePacketsReceivedSinceLastAck >= retransmittablePacketsBeforeAck {
 			h.ackQueued = true
 		} else {
 			if h.ackAlarm.IsZero() {

internal/ackhandler/received_packet_handler_test.go

@@ -98,7 +98,7 @@ var _ = Describe("receivedPacketHandler", func() {
 			It("queues an ACK for every RetransmittablePacketsBeforeAck retransmittable packet, if they are arriving fast", func() {
 				receiveAndAck10Packets()
 				p := protocol.PacketNumber(11)
-				for i := 0; i < protocol.RetransmittablePacketsBeforeAck-1; i++ {
+				for i := 0; i < retransmittablePacketsBeforeAck-1; i++ {
 					err := handler.ReceivedPacket(p, time.Time{}, true)
 					Expect(err).ToNot(HaveOccurred())
 					Expect(handler.ackQueued).To(BeFalse())

internal/protocol/server_parameters.go

@@ -24,10 +24,6 @@ const MaxUndecryptablePackets = 10
 // This timeout allows the Go scheduler to switch to the Go rountine that reads the crypto stream and to escalate the crypto
 const PublicResetTimeout = 500 * time.Millisecond
 
-// AckSendDelay is the maximum delay that can be applied to an ACK for a retransmittable packet
-// This is the value Chromium is using
-const AckSendDelay = 25 * time.Millisecond
-
 // ReceiveStreamFlowControlWindow is the stream-level flow control window for receiving data
 // This is the value that Google servers are using
 const ReceiveStreamFlowControlWindow = (1 << 10) * 32 // 32 kB
@@ -92,9 +88,6 @@ const MaxTrackedReceivedAckRanges = DefaultMaxCongestionWindow
 // MaxNonRetransmittableAcks is the maximum number of packets containing an ACK, but no retransmittable frames, that we send in a row
 const MaxNonRetransmittableAcks = 19
 
-// RetransmittablePacketsBeforeAck is the number of retransmittable that an ACK is sent for
-const RetransmittablePacketsBeforeAck = 10
-
 // MaxStreamFrameSorterGaps is the maximum number of gaps between received StreamFrames
 // prevents DoS attacks against the streamFrameSorter
 const MaxStreamFrameSorterGaps = 1000