Move the contest_id checks in submission_scored/tokened

cms-dev · Dec 14, 2021 · fe0d48f · fe0d48f
1 parent a0c8be8
commit fe0d48f
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/cms/service/ProxyService.py b/cms/service/ProxyService.py
@@ -387,10 +387,6 @@ def operations_for_score(self, submission):
         queues for them to be sent to rankings.
 
         """
-        # ScoringService sent us a submission of another contest.
-        if submission.task.contest_id != self.contest_id:
-            return []
-
         submission_result = submission.get_result()
 
         # Data to send to remote rankings.
@@ -427,9 +423,6 @@ def operations_for_token(self, submission):
         queues for them to be sent to rankings.
 
         """
-        # ScoringService sent us a submission of another contest.
-        if submission.task.contest_id != self.contest_id:
-            return []
         # Data to send to remote rankings.
         submission_id = "%d" % submission.id
         submission_data = {
@@ -496,6 +489,11 @@ def submission_scored(self, submission_id):
                             submission_id)
                 return
 
+            # ScoringService sent us a submission of another contest, they
+            # do not know about our contest_id in multicontest setup.
+            if submission.task.contest_id != self.contest_id:
+                return
+
             # Update RWS.
             for operation in self.operations_for_score(submission):
                 self.enqueue(operation)
@@ -531,6 +529,11 @@ def submission_tokened(self, submission_id):
                             submission_id)
                 return
 
+            # ScoringService sent us a submission of another contest, they
+            # do not know about our contest_id in multicontest setup.
+            if submission.task.contest_id != self.contest_id:
+                return
+
             # Update RWS.
             for operation in self.operations_for_token(submission):
                 self.enqueue(operation)