From 5c7d120b8f83f276effde086c496b2c0aa55bfa5 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 24 Dec 2022 12:18:00 +1300 Subject: [PATCH] remove unused version parameter form the connIDGenerator --- conn_id_generator.go | 4 ---- conn_id_generator_test.go | 1 - connection.go | 2 -- 3 files changed, 7 deletions(-) diff --git a/conn_id_generator.go b/conn_id_generator.go index c56e8a4c1..a52099b96 100644 --- a/conn_id_generator.go +++ b/conn_id_generator.go @@ -22,8 +22,6 @@ type connIDGenerator struct { retireConnectionID func(protocol.ConnectionID) replaceWithClosed func([]protocol.ConnectionID, protocol.Perspective, []byte) queueControlFrame func(wire.Frame) - - version protocol.VersionNumber } func newConnIDGenerator( @@ -36,7 +34,6 @@ func newConnIDGenerator( replaceWithClosed func([]protocol.ConnectionID, protocol.Perspective, []byte), queueControlFrame func(wire.Frame), generator ConnectionIDGenerator, - version protocol.VersionNumber, ) *connIDGenerator { m := &connIDGenerator{ generator: generator, @@ -47,7 +44,6 @@ func newConnIDGenerator( retireConnectionID: retireConnectionID, replaceWithClosed: replaceWithClosed, queueControlFrame: queueControlFrame, - version: version, } m.activeSrcConnIDs[0] = initialConnectionID m.initialClientDestConnID = initialClientDestConnID diff --git a/conn_id_generator_test.go b/conn_id_generator_test.go index f1b43b24a..aa54a3022 100644 --- a/conn_id_generator_test.go +++ b/conn_id_generator_test.go @@ -46,7 +46,6 @@ var _ = Describe("Connection ID Generator", func() { }, func(f wire.Frame) { queuedFrames = append(queuedFrames, f) }, &protocol.DefaultConnectionIDGenerator{ConnLen: initialConnID.Len()}, - protocol.VersionDraft29, ) }) diff --git a/connection.go b/connection.go index d7930911d..679990d5b 100644 --- a/connection.go +++ b/connection.go @@ -284,7 +284,6 @@ var newConnection = func( runner.ReplaceWithClosed, s.queueControlFrame, s.config.ConnectionIDGenerator, - s.version, ) s.preSetup() s.ctx, s.ctxCancel = context.WithCancel(context.WithValue(context.Background(), ConnectionTracingKey, tracingID)) @@ -418,7 +417,6 @@ var newClientConnection = func( runner.ReplaceWithClosed, s.queueControlFrame, s.config.ConnectionIDGenerator, - s.version, ) s.preSetup() s.ctx, s.ctxCancel = context.WithCancel(context.WithValue(context.Background(), ConnectionTracingKey, tracingID))