Remove requestID expectation for UnrequestedOps (#3989)

Author: StephenButtolph

message/fields.go

@@ -83,14 +83,9 @@ type requestIDGetter interface {
 
 func GetRequestID(m any) (uint32, bool) {
 	if msg, ok := m.(requestIDGetter); ok {
-		requestID := msg.GetRequestId()
-		return requestID, true
+		return msg.GetRequestId(), true
 	}
-
-	// AppGossip is the only inbound message not containing a requestID. For
-	// ease of handling, imagine that it does have a requestID.
-	_, ok := m.(*p2p.AppGossip)
-	return 0, ok
+	return 0, false
 }
 
 type engineTypeGetter interface {

snow/networking/router/chain_router.go

@@ -221,18 +221,6 @@ func (cr *ChainRouter) HandleInbound(ctx context.Context, msg message.InboundMes
 		return
 	}
 
-	requestID, ok := message.GetRequestID(m)
-	if !ok {
-		cr.log.Debug("dropping message with invalid field",
-			zap.Stringer("nodeID", nodeID),
-			zap.Stringer("messageOp", op),
-			zap.String("field", "RequestID"),
-		)
-
-		msg.OnFinishedHandling()
-		return
-	}
-
 	cr.lock.Lock()
 	defer cr.lock.Unlock()
 
@@ -296,6 +284,18 @@ func (cr *ChainRouter) HandleInbound(ctx context.Context, msg message.InboundMes
 		return
 	}
 
+	requestID, ok := message.GetRequestID(m)
+	if !ok {
+		cr.log.Debug("dropping message with invalid field",
+			zap.Stringer("nodeID", nodeID),
+			zap.Stringer("messageOp", op),
+			zap.String("field", "RequestID"),
+		)
+
+		msg.OnFinishedHandling()
+		return
+	}
+
 	if expectedResponse, isFailed := message.FailedToResponseOps[op]; isFailed {
 		// Create the request ID of the request we sent that this message is in
 		// response to.