Skip to content

Commit

Permalink
Remove unused meteredHandler struct type (#3450)
Browse files Browse the repository at this point in the history
Signed-off-by: Joshua Kim <[email protected]>
  • Loading branch information
joshua-kim authored Oct 9, 2024
1 parent 814ad2c commit d2e9d12
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions network/p2p/router.go
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

0 comments on commit d2e9d12

Please sign in to comment.