From e9b4f9ba078be7c712f35300782507da878926b7 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Sun, 21 Mar 2021 12:51:18 +0800
Subject: [PATCH] avoid type confusion between protocol.PacketType and
 logging.PacketType

The enums have completely different meanings. protocol.PacketType only
defines long header types, whereas logging.PacketType defines all
different types of QUIC packets (including short header packets).
---
 internal/mocks/logging/connection_tracer.go | 4 ++--
 internal/mocks/logging/tracer.go            | 2 +-
 logging/mock_connection_tracer_test.go      | 4 ++--
 logging/mock_tracer_test.go                 | 2 +-
 logging/types.go                            | 4 +---
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/internal/mocks/logging/connection_tracer.go b/internal/mocks/logging/connection_tracer.go
index 64d774ca916..a75425ef32a 100644
--- a/internal/mocks/logging/connection_tracer.go
+++ b/internal/mocks/logging/connection_tracer.go
@@ -40,7 +40,7 @@ func (m *MockConnectionTracer) EXPECT() *MockConnectionTracerMockRecorder {
 }
 
 // BufferedPacket mocks base method.
-func (m *MockConnectionTracer) BufferedPacket(arg0 protocol.PacketType) {
+func (m *MockConnectionTracer) BufferedPacket(arg0 logging.PacketType) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "BufferedPacket", arg0)
 }
@@ -112,7 +112,7 @@ func (mr *MockConnectionTracerMockRecorder) DroppedKey(arg0 interface{}) *gomock
 }
 
 // DroppedPacket mocks base method.
-func (m *MockConnectionTracer) DroppedPacket(arg0 protocol.PacketType, arg1 protocol.ByteCount, arg2 logging.PacketDropReason) {
+func (m *MockConnectionTracer) DroppedPacket(arg0 logging.PacketType, arg1 protocol.ByteCount, arg2 logging.PacketDropReason) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "DroppedPacket", arg0, arg1, arg2)
 }
diff --git a/internal/mocks/logging/tracer.go b/internal/mocks/logging/tracer.go
index 30f814f7af8..16a942b3438 100644
--- a/internal/mocks/logging/tracer.go
+++ b/internal/mocks/logging/tracer.go
@@ -38,7 +38,7 @@ func (m *MockTracer) EXPECT() *MockTracerMockRecorder {
 }
 
 // DroppedPacket mocks base method.
-func (m *MockTracer) DroppedPacket(arg0 net.Addr, arg1 protocol.PacketType, arg2 protocol.ByteCount, arg3 logging.PacketDropReason) {
+func (m *MockTracer) DroppedPacket(arg0 net.Addr, arg1 logging.PacketType, arg2 protocol.ByteCount, arg3 logging.PacketDropReason) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "DroppedPacket", arg0, arg1, arg2, arg3)
 }
diff --git a/logging/mock_connection_tracer_test.go b/logging/mock_connection_tracer_test.go
index 4ec76d6b64f..cf9b9112472 100644
--- a/logging/mock_connection_tracer_test.go
+++ b/logging/mock_connection_tracer_test.go
@@ -39,7 +39,7 @@ func (m *MockConnectionTracer) EXPECT() *MockConnectionTracerMockRecorder {
 }
 
 // BufferedPacket mocks base method.
-func (m *MockConnectionTracer) BufferedPacket(arg0 protocol.PacketType) {
+func (m *MockConnectionTracer) BufferedPacket(arg0 PacketType) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "BufferedPacket", arg0)
 }
@@ -111,7 +111,7 @@ func (mr *MockConnectionTracerMockRecorder) DroppedKey(arg0 interface{}) *gomock
 }
 
 // DroppedPacket mocks base method.
-func (m *MockConnectionTracer) DroppedPacket(arg0 protocol.PacketType, arg1 protocol.ByteCount, arg2 PacketDropReason) {
+func (m *MockConnectionTracer) DroppedPacket(arg0 PacketType, arg1 protocol.ByteCount, arg2 PacketDropReason) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "DroppedPacket", arg0, arg1, arg2)
 }
diff --git a/logging/mock_tracer_test.go b/logging/mock_tracer_test.go
index 971c319cc99..f8dd2ad9b14 100644
--- a/logging/mock_tracer_test.go
+++ b/logging/mock_tracer_test.go
@@ -37,7 +37,7 @@ func (m *MockTracer) EXPECT() *MockTracerMockRecorder {
 }
 
 // DroppedPacket mocks base method.
-func (m *MockTracer) DroppedPacket(arg0 net.Addr, arg1 protocol.PacketType, arg2 protocol.ByteCount, arg3 PacketDropReason) {
+func (m *MockTracer) DroppedPacket(arg0 net.Addr, arg1 PacketType, arg2 protocol.ByteCount, arg3 PacketDropReason) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "DroppedPacket", arg0, arg1, arg2, arg3)
 }
diff --git a/logging/types.go b/logging/types.go
index 41a776c89d2..e18865033ec 100644
--- a/logging/types.go
+++ b/logging/types.go
@@ -1,9 +1,7 @@
 package logging
 
-import "github.com/lucas-clemente/quic-go/internal/protocol"
-
 // PacketType is the packet type of a QUIC packet
-type PacketType = protocol.PacketType
+type PacketType uint8
 
 const (
 	// PacketTypeInitial is the packet type of an Initial packet