From 0c85e0eab9d645f21db8f5c1652c4cbe9a398dd5 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 21 Aug 2019 14:49:00 +0700
Subject: [PATCH] remove unused PacketType field from the ackhandler.Packet

---
 internal/ackhandler/packet.go |  1 -
 packet_packer.go              |  1 -
 packet_packer_test.go         |  2 --
 session_test.go               | 10 ++--------
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/internal/ackhandler/packet.go b/internal/ackhandler/packet.go
index ed917e49..0ace4d65 100644
--- a/internal/ackhandler/packet.go
+++ b/internal/ackhandler/packet.go
@@ -10,7 +10,6 @@ import (
 // A Packet is a packet
 type Packet struct {
 	PacketNumber    protocol.PacketNumber
-	PacketType      protocol.PacketType
 	Frames          []wire.Frame
 	LargestAcked    protocol.PacketNumber // InvalidPacketNumber if the packet doesn't contain an ACK
 	Length          protocol.ByteCount
diff --git a/packet_packer.go b/packet_packer.go
index 91130c3c..8a4548a2 100644
--- a/packet_packer.go
+++ b/packet_packer.go
@@ -69,7 +69,6 @@ func (p *packedPacket) ToAckHandlerPacket() *ackhandler.Packet {
 	}
 	return &ackhandler.Packet{
 		PacketNumber:    p.header.PacketNumber,
-		PacketType:      p.header.Type,
 		LargestAcked:    largestAcked,
 		Frames:          p.frames,
 		Length:          protocol.ByteCount(len(p.raw)),
diff --git a/packet_packer_test.go b/packet_packer_test.go
index 11fdaaa9..1c152100 100644
--- a/packet_packer_test.go
+++ b/packet_packer_test.go
@@ -932,7 +932,6 @@ var _ = Describe("Packet packer", func() {
 					pnManager.EXPECT().PopPacketNumber(protocol.EncryptionInitial).Return(protocol.PacketNumber(0x42))
 					sealingManager.EXPECT().GetInitialSealer().Return(sealer, nil)
 					packet := &ackhandler.Packet{
-						PacketType:      protocol.PacketTypeHandshake,
 						EncryptionLevel: protocol.EncryptionInitial,
 						Frames:          []wire.Frame{cf},
 					}
@@ -952,7 +951,6 @@ var _ = Describe("Packet packer", func() {
 					sealingManager.EXPECT().GetInitialSealer().Return(sealer, nil)
 					packer.perspective = protocol.PerspectiveClient
 					packet := &ackhandler.Packet{
-						PacketType:      protocol.PacketTypeInitial,
 						EncryptionLevel: protocol.EncryptionInitial,
 						Frames:          []wire.Frame{cf},
 					}
diff --git a/session_test.go b/session_test.go
index 82e606cc..56d13fab 100644
--- a/session_test.go
+++ b/session_test.go
@@ -867,10 +867,7 @@ var _ = Describe("Session", func() {
 		})
 
 		It("sends a retransmission and a regular packet in the same run", func() {
-			packetToRetransmit := &ackhandler.Packet{
-				PacketNumber: 10,
-				PacketType:   protocol.PacketTypeHandshake,
-			}
+			packetToRetransmit := &ackhandler.Packet{PacketNumber: 10}
 			retransmittedPacket := getPacket(123)
 			newPacket := getPacket(234)
 			sess.windowUpdateQueue.callback(&wire.MaxDataFrame{})
@@ -921,10 +918,7 @@ var _ = Describe("Session", func() {
 		})
 
 		It("sends a probe packet", func() {
-			packetToRetransmit := &ackhandler.Packet{
-				PacketNumber: 0x42,
-				PacketType:   protocol.PacketTypeHandshake,
-			}
+			packetToRetransmit := &ackhandler.Packet{PacketNumber: 0x42}
 			retransmittedPacket := getPacket(123)
 			sph := mockackhandler.NewMockSentPacketHandler(mockCtrl)
 			sph.EXPECT().TimeUntilSend()