Skip to content

Remove unused meteredHandler struct type #3450

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Remove unused meteredHandler struct type #3450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 8 additions & 17 deletions network/p2p/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ type pendingAppRequest struct {
callback AppResponseCallback
}

// meteredHandler emits metrics for a Handler
type meteredHandler struct {
*responder
metrics
}

type metrics struct {
msgTime *prometheus.GaugeVec
msgCount *prometheus.CounterVec
Expand Down Expand Up @@ -69,7 +63,7 @@ type router struct {
metrics metrics

lock sync.RWMutex
handlers map[uint64]*meteredHandler
handlers map[uint64]*responder
pendingAppRequests map[uint32]pendingAppRequest
requestID uint32
}
Expand All @@ -84,7 +78,7 @@ func newRouter(
log: log,
sender: sender,
metrics: metrics,
handlers: make(map[uint64]*meteredHandler),
handlers: make(map[uint64]*responder),
pendingAppRequests: make(map[uint32]pendingAppRequest),
// invariant: sdk uses odd-numbered requestIDs
requestID: 1,
Expand All @@ -99,14 +93,11 @@ func (r *router) addHandler(handlerID uint64, handler Handler) error {
return fmt.Errorf("failed to register handler id %d: %w", handlerID, ErrExistingAppProtocol)
}

r.handlers[handlerID] = &meteredHandler{
responder: &responder{
Handler: handler,
handlerID: handlerID,
log: r.log,
sender: r.sender,
},
metrics: r.metrics,
r.handlers[handlerID] = &responder{
Handler: handler,
handlerID: handlerID,
log: r.log,
sender: r.sender,
}

return nil
Expand Down Expand Up @@ -235,7 +226,7 @@ func (r *router) AppGossip(ctx context.Context, nodeID ids.NodeID, gossip []byte
// - A boolean indicating that parsing succeeded.
//
// Invariant: Assumes [r.lock] isn't held.
func (r *router) parse(prefixedMsg []byte) ([]byte, *meteredHandler, string, bool) {
func (r *router) parse(prefixedMsg []byte) ([]byte, *responder, string, bool) {
handlerID, msg, ok := ParseMessage(prefixedMsg)
if !ok {
return nil, nil, "", false
Expand Down
Loading