Skip to content

Commit cb14acf

Browse files
authored
fix(holepunch/tracer): replace inline peer struct with peerInfo type (#3049)
1 parent 662cfcf commit cb14acf

File tree

1 file changed

+18
-25
lines changed

1 file changed

+18
-25
lines changed

p2p/protocol/holepunch/tracer.go

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ const (
2020
func WithTracer(et EventTracer) Option {
2121
return func(hps *Service) error {
2222
hps.tracer = &tracer{
23-
et: et,
24-
mt: nil,
25-
self: hps.host.ID(),
26-
peers: make(map[peer.ID]struct {
27-
counter int
28-
last time.Time
29-
}),
23+
et: et,
24+
mt: nil,
25+
self: hps.host.ID(),
26+
peers: make(map[peer.ID]peerInfo),
3027
}
3128
return nil
3229
}
@@ -36,13 +33,10 @@ func WithTracer(et EventTracer) Option {
3633
func WithMetricsTracer(mt MetricsTracer) Option {
3734
return func(hps *Service) error {
3835
hps.tracer = &tracer{
39-
et: nil,
40-
mt: mt,
41-
self: hps.host.ID(),
42-
peers: make(map[peer.ID]struct {
43-
counter int
44-
last time.Time
45-
}),
36+
et: nil,
37+
mt: mt,
38+
self: hps.host.ID(),
39+
peers: make(map[peer.ID]peerInfo),
4640
}
4741
return nil
4842
}
@@ -52,13 +46,10 @@ func WithMetricsTracer(mt MetricsTracer) Option {
5246
func WithMetricsAndEventTracer(mt MetricsTracer, et EventTracer) Option {
5347
return func(hps *Service) error {
5448
hps.tracer = &tracer{
55-
et: et,
56-
mt: mt,
57-
self: hps.host.ID(),
58-
peers: make(map[peer.ID]struct {
59-
counter int
60-
last time.Time
61-
}),
49+
et: et,
50+
mt: mt,
51+
self: hps.host.ID(),
52+
peers: make(map[peer.ID]peerInfo),
6253
}
6354
return nil
6455
}
@@ -74,10 +65,12 @@ type tracer struct {
7465
ctxCancel context.CancelFunc
7566

7667
mutex sync.Mutex
77-
peers map[peer.ID]struct {
78-
counter int
79-
last time.Time
80-
}
68+
peers map[peer.ID]peerInfo
69+
}
70+
71+
type peerInfo struct {
72+
counter int
73+
last time.Time
8174
}
8275

8376
type EventTracer interface {

0 commit comments

Comments
 (0)