gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

remove unneeded Connection.GetVersion method (#4792)

Browse Source 
Instead, use Connection.ConnectionState().Version.
This commit is contained in:
Marten Seemann
2024-12-23 20:29:26 +08:00
committed by GitHub
parent 0264fd6f4f
commit 7d54aa41a3
3 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
connection.go
View File

@@ -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.

5
connection_test.go
View File

@@ -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

12
integrationtests/versionnegotiation/handshake_test.go
View File

@@ -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 {