From feb3e9a71355f6af29fe780c8e3e3258897a32d4 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 27 May 2020 10:38:51 +0700
Subject: [PATCH] rename lastSentAckElicitingPacketTime to
 lastAckElicitingPacketTime

---
 internal/ackhandler/sent_packet_handler.go     | 18 +++++++++---------
 .../ackhandler/sent_packet_handler_test.go     |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal/ackhandler/sent_packet_handler.go b/internal/ackhandler/sent_packet_handler.go
index 584e7ef2..4925d860 100644
--- a/internal/ackhandler/sent_packet_handler.go
+++ b/internal/ackhandler/sent_packet_handler.go
@@ -28,8 +28,8 @@ type packetNumberSpace struct {
 	history *sentPacketHistory
 	pns     *packetNumberGenerator
 
-	lossTime                       time.Time
-	lastSentAckElicitingPacketTime time.Time
+	lossTime                   time.Time
+	lastAckElicitingPacketTime time.Time
 
 	largestAcked protocol.PacketNumber
 	largestSent  protocol.PacketNumber
@@ -244,7 +244,7 @@ func (h *sentPacketHandler) sentPacketImpl(packet *Packet) bool /* is ack-elicit
 	isAckEliciting := len(packet.Frames) > 0
 
 	if isAckEliciting {
-		pnSpace.lastSentAckElicitingPacketTime = packet.SendTime
+		pnSpace.lastAckElicitingPacketTime = packet.SendTime
 		packet.includedInBytesInFlight = true
 		h.bytesInFlight += packet.Length
 		if h.numProbesToSend > 0 {
@@ -419,22 +419,22 @@ func (h *sentPacketHandler) getEarliestLossTimeAndSpace() (time.Time, protocol.E
 	return lossTime, encLevel
 }
 
-// same logic as getEarliestLossTimeAndSpace, but for lastSentAckElicitingPacketTime instead of lossTime
+// same logic as getEarliestLossTimeAndSpace, but for lastAckElicitingPacketTime instead of lossTime
 func (h *sentPacketHandler) getEarliestSentTimeAndSpace() (time.Time, protocol.EncryptionLevel) {
 	var encLevel protocol.EncryptionLevel
 	var sentTime time.Time
 
 	if h.initialPackets != nil {
-		sentTime = h.initialPackets.lastSentAckElicitingPacketTime
+		sentTime = h.initialPackets.lastAckElicitingPacketTime
 		encLevel = protocol.EncryptionInitial
 	}
-	if h.handshakePackets != nil && (sentTime.IsZero() || (!h.handshakePackets.lastSentAckElicitingPacketTime.IsZero() && h.handshakePackets.lastSentAckElicitingPacketTime.Before(sentTime))) {
-		sentTime = h.handshakePackets.lastSentAckElicitingPacketTime
+	if h.handshakePackets != nil && (sentTime.IsZero() || (!h.handshakePackets.lastAckElicitingPacketTime.IsZero() && h.handshakePackets.lastAckElicitingPacketTime.Before(sentTime))) {
+		sentTime = h.handshakePackets.lastAckElicitingPacketTime
 		encLevel = protocol.EncryptionHandshake
 	}
 	if h.handshakeComplete &&
-		(sentTime.IsZero() || (!h.appDataPackets.lastSentAckElicitingPacketTime.IsZero() && h.appDataPackets.lastSentAckElicitingPacketTime.Before(sentTime))) {
-		sentTime = h.appDataPackets.lastSentAckElicitingPacketTime
+		(sentTime.IsZero() || (!h.appDataPackets.lastAckElicitingPacketTime.IsZero() && h.appDataPackets.lastAckElicitingPacketTime.Before(sentTime))) {
+		sentTime = h.appDataPackets.lastAckElicitingPacketTime
 		encLevel = protocol.Encryption1RTT
 	}
 	return sentTime, encLevel
diff --git a/internal/ackhandler/sent_packet_handler_test.go b/internal/ackhandler/sent_packet_handler_test.go
index 1117a310..3bc2704d 100644
--- a/internal/ackhandler/sent_packet_handler_test.go
+++ b/internal/ackhandler/sent_packet_handler_test.go
@@ -125,20 +125,20 @@ var _ = Describe("SentPacketHandler", func() {
 		It("stores the sent time", func() {
 			sendTime := time.Now().Add(-time.Minute)
 			handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 1, SendTime: sendTime}))
-			Expect(handler.appDataPackets.lastSentAckElicitingPacketTime).To(Equal(sendTime))
+			Expect(handler.appDataPackets.lastAckElicitingPacketTime).To(Equal(sendTime))
 		})
 
 		It("stores the sent time of Initial packets", func() {
 			sendTime := time.Now().Add(-time.Minute)
 			handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 1, SendTime: sendTime, EncryptionLevel: protocol.EncryptionInitial}))
 			handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 2, SendTime: sendTime.Add(time.Hour), EncryptionLevel: protocol.Encryption1RTT}))
-			Expect(handler.initialPackets.lastSentAckElicitingPacketTime).To(Equal(sendTime))
+			Expect(handler.initialPackets.lastAckElicitingPacketTime).To(Equal(sendTime))
 		})
 
 		It("does not store non-ack-eliciting packets", func() {
 			handler.SentPacket(nonAckElicitingPacket(&Packet{PacketNumber: 1}))
 			Expect(handler.appDataPackets.history.Len()).To(BeZero())
-			Expect(handler.appDataPackets.lastSentAckElicitingPacketTime).To(BeZero())
+			Expect(handler.appDataPackets.lastAckElicitingPacketTime).To(BeZero())
 			Expect(handler.bytesInFlight).To(BeZero())
 		})
 	})