Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ackhandler: remove unused RTTStats from the received packet handler #4287

Merged
merged 1 commit into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/ackhandler/ackhandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ func NewAckHandler(
logger utils.Logger,
) (SentPacketHandler, ReceivedPacketHandler) {
sph := newSentPacketHandler(initialPacketNumber, initialMaxDatagramSize, rttStats, clientAddressValidated, enableECN, pers, tracer, logger)
return sph, newReceivedPacketHandler(sph, rttStats, logger)
return sph, newReceivedPacketHandler(sph, logger)
}
12 changes: 4 additions & 8 deletions internal/ackhandler/received_packet_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,12 @@ type receivedPacketHandler struct {

var _ ReceivedPacketHandler = &receivedPacketHandler{}

func newReceivedPacketHandler(
sentPackets sentPacketTracker,
rttStats *utils.RTTStats,
logger utils.Logger,
) ReceivedPacketHandler {
func newReceivedPacketHandler(sentPackets sentPacketTracker, logger utils.Logger) ReceivedPacketHandler {
return &receivedPacketHandler{
sentPackets: sentPackets,
initialPackets: newReceivedPacketTracker(rttStats, logger),
handshakePackets: newReceivedPacketTracker(rttStats, logger),
appDataPackets: newReceivedPacketTracker(rttStats, logger),
initialPackets: newReceivedPacketTracker(logger),
handshakePackets: newReceivedPacketTracker(logger),
appDataPackets: newReceivedPacketTracker(logger),
lowest1RTTPacket: protocol.InvalidPacketNumber,
}
}
Expand Down
6 changes: 1 addition & 5 deletions internal/ackhandler/received_packet_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ var _ = Describe("Received Packet Handler", func() {

BeforeEach(func() {
sentPackets = NewMockSentPacketTracker(mockCtrl)
handler = newReceivedPacketHandler(
sentPackets,
&utils.RTTStats{},
utils.DefaultLogger,
)
handler = newReceivedPacketHandler(sentPackets, utils.DefaultLogger)
})

It("generates ACKs for different packet number spaces", func() {
Expand Down
7 changes: 1 addition & 6 deletions internal/ackhandler/received_packet_tracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ type receivedPacketTracker struct {
packetHistory *receivedPacketHistory

maxAckDelay time.Duration
rttStats *utils.RTTStats

hasNewAck bool // true as soon as we received an ack-eliciting new packet
ackQueued bool // true once we received more than 2 (or later in the connection 10) ack-eliciting packets
Expand All @@ -33,14 +32,10 @@ type receivedPacketTracker struct {
logger utils.Logger
}

func newReceivedPacketTracker(
rttStats *utils.RTTStats,
logger utils.Logger,
) *receivedPacketTracker {
func newReceivedPacketTracker(logger utils.Logger) *receivedPacketTracker {
return &receivedPacketTracker{
packetHistory: newReceivedPacketHistory(),
maxAckDelay: protocol.MaxAckDelay,
rttStats: rttStats,
logger: logger,
}
}
Expand Down
8 changes: 2 additions & 6 deletions internal/ackhandler/received_packet_tracker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@ import (
)

var _ = Describe("Received Packet Tracker", func() {
var (
tracker *receivedPacketTracker
rttStats *utils.RTTStats
)
var tracker *receivedPacketTracker

BeforeEach(func() {
rttStats = &utils.RTTStats{}
tracker = newReceivedPacketTracker(rttStats, utils.DefaultLogger)
tracker = newReceivedPacketTracker(utils.DefaultLogger)
})

Context("accepting packets", func() {
Expand Down
Loading