From 7d54aa41a34484cb18dbbfc09b4d5db564af8f48 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Mon, 23 Dec 2024 20:29:26 +0800
Subject: [PATCH] remove unneeded Connection.GetVersion method (#4792)

Instead, use Connection.ConnectionState().Version.
---
 connection.go                                       | 13 ++-----------
 connection_test.go                                  |  5 -----
 .../versionnegotiation/handshake_test.go            | 12 ++++--------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/connection.go b/connection.go
index 8bd6f360..ae3c8fa4 100644
--- a/connection.go
+++ b/connection.go
@@ -2306,17 +2306,8 @@ func (s *connection) ReceiveDatagram(ctx context.Context) ([]byte, error) {
 	return s.datagramQueue.Receive(ctx)
 }
 
-func (s *connection) LocalAddr() net.Addr {
-	return s.conn.LocalAddr()
-}
-
-func (s *connection) RemoteAddr() net.Addr {
-	return s.conn.RemoteAddr()
-}
-
-func (s *connection) GetVersion() protocol.Version {
-	return s.version
-}
+func (s *connection) LocalAddr() net.Addr  { return s.conn.LocalAddr() }
+func (s *connection) RemoteAddr() net.Addr { return s.conn.RemoteAddr() }
 
 func (s *connection) NextConnection(ctx context.Context) (Connection, error) {
 	// The handshake might fail after the server rejected 0-RTT.
diff --git a/connection_test.go b/connection_test.go
index 6b2b233f..1cf1d936 100644
--- a/connection_test.go
+++ b/connection_test.go
@@ -419,11 +419,6 @@ var _ = Describe("Connection", func() {
 		})
 	})
 
-	It("tells its versions", func() {
-		conn.version = 4242
-		Expect(conn.GetVersion()).To(Equal(protocol.Version(4242)))
-	})
-
 	Context("closing", func() {
 		var (
 			runErr         chan error
diff --git a/integrationtests/versionnegotiation/handshake_test.go b/integrationtests/versionnegotiation/handshake_test.go
index 49616a96..50170da2 100644
--- a/integrationtests/versionnegotiation/handshake_test.go
+++ b/integrationtests/versionnegotiation/handshake_test.go
@@ -15,10 +15,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-type versioner interface {
-	GetVersion() protocol.Version
-}
-
 type result struct {
 	loggedVersions                 bool
 	receivedVersionNegotiation     bool
@@ -73,9 +69,9 @@ func TestServerSupportsMoreVersionsThanClient(t *testing.T) {
 
 	sconn, err := server.Accept(context.Background())
 	require.NoError(t, err)
-	require.Equal(t, expectedVersion, sconn.(versioner).GetVersion())
+	require.Equal(t, expectedVersion, sconn.ConnectionState().Version)
 
-	require.Equal(t, expectedVersion, conn.(versioner).GetVersion())
+	require.Equal(t, expectedVersion, conn.ConnectionState().Version)
 	require.NoError(t, conn.CloseWithError(0, ""))
 
 	select {
@@ -129,9 +125,9 @@ func TestClientSupportsMoreVersionsThanServer(t *testing.T) {
 
 	sconn, err := server.Accept(context.Background())
 	require.NoError(t, err)
-	require.Equal(t, expectedVersion, sconn.(versioner).GetVersion())
+	require.Equal(t, expectedVersion, sconn.ConnectionState().Version)
 
-	require.Equal(t, protocol.SupportedVersions[0], conn.(versioner).GetVersion())
+	require.Equal(t, protocol.SupportedVersions[0], conn.ConnectionState().Version)
 	require.NoError(t, conn.CloseWithError(0, ""))
 
 	select {