Hand over objects instead of ids to the interlocking (#365)

BP2022-AP1 · Apr 20, 2023 · ee3e0d7 · ee3e0d7
1 parent 011f231
commit ee3e0d7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/fault_injector/fault_types/platform_blocked_fault.py b/src/fault_injector/fault_types/platform_blocked_fault.py
@@ -24,7 +24,7 @@ def inject_fault(self, tick: int):
         ][0]
         self.platform.blocked = True
 
-        self.interlocking.insert_platform_blocked(self.platform.identifier)
+        self.interlocking.insert_platform_blocked(self.platform)
         self.logger.inject_platform_blocked_fault(
             tick, self.configuration.id, self.platform.identifier
         )
@@ -41,6 +41,6 @@ def resolve_fault(self, tick: int):
             )
         self.platform.blocked = False
 
-        self.interlocking.insert_platform_unblocked(self.platform.identifier)
+        self.interlocking.insert_platform_unblocked(self.platform)
 
         self.logger.resolve_platform_blocked_fault(tick, self.configuration.id)
diff --git a/src/fault_injector/fault_types/track_blocked_fault.py b/src/fault_injector/fault_types/track_blocked_fault.py
@@ -22,7 +22,7 @@ def inject_fault(self, tick: int):
         )
         self.track.blocked = True
 
-        self.interlocking.insert_track_blocked(self.track.identifier)
+        self.interlocking.insert_track_blocked(self.track)
         self.logger.inject_track_blocked_fault(
             tick, self.configuration.id, self.track.identifier
         )
@@ -37,6 +37,6 @@ def resolve_fault(self, tick: int):
             raise ValueError("Track not set, probably due to not injecting the fault")
 
         self.track.blocked = False
-        self.interlocking.insert_track_unblocked(self.track.identifier)
+        self.interlocking.insert_track_unblocked(self.track)
 
         self.logger.resolve_track_blocked_fault(tick, self.configuration.id)
diff --git a/src/fault_injector/fault_types/track_speed_limit_fault.py b/src/fault_injector/fault_types/track_speed_limit_fault.py
@@ -24,7 +24,7 @@ def inject_fault(self, tick: int):
         self.old_speed_limit = self.track.max_speed
         self.track.max_speed = self.configuration.new_speed_limit
 
-        self.interlocking.insert_track_speed_limit_changed(self.track.identifier)
+        self.interlocking.insert_track_speed_limit_changed(self.track)
         self.logger.inject_track_speed_limit_fault(
             tick,
             self.configuration.id,
@@ -40,6 +40,6 @@ def resolve_fault(self, tick: int):
         :type tick: Integer
         """
         self.track.max_speed = self.old_speed_limit
-        self.interlocking.insert_track_speed_limit_changed(self.track.identifier)
+        self.interlocking.insert_track_speed_limit_changed(self.track)
 
         self.logger.resolve_track_speed_limit_fault(tick, self.configuration.id)
diff --git a/src/fault_injector/fault_types/train_prio_fault.py b/src/fault_injector/fault_types/train_prio_fault.py
@@ -24,7 +24,7 @@ def inject_fault(self, tick: int):
         self.old_prio = self.train.train_type.priority
         self.train.train_type.priority = self.configuration.new_prio
 
-        self.interlocking.insert_train_priority_changed(self.train.identifier)
+        self.interlocking.insert_train_priority_changed(self.train)
         self.logger.inject_train_prio_fault(
             tick,
             self.configuration.id,
@@ -40,5 +40,5 @@ def resolve_fault(self, tick: int):
         :type tick: Integer
         """
         self.train.train_type.priority = self.old_prio
-        self.interlocking.insert_train_priority_changed(self.train.identifier)
+        self.interlocking.insert_train_priority_changed(self.train)
         self.logger.resolve_train_prio_fault(tick, self.configuration.id)
diff --git a/src/fault_injector/fault_types/train_speed_fault.py b/src/fault_injector/fault_types/train_speed_fault.py
@@ -24,7 +24,7 @@ def inject_fault(self, tick: int):
         self.old_speed = self.train.train_type.max_speed
         self.train.train_type.max_speed = self.configuration.new_speed
 
-        self.interlocking.insert_train_max_speed_changed(self.train.identifier)
+        self.interlocking.insert_train_max_speed_changed(self.train)
         self.logger.inject_train_speed_fault(
             tick,
             self.configuration.id,
@@ -40,5 +40,5 @@ def resolve_fault(self, tick: int):
         :type tick: Integer
         """
         self.train.train_type.max_speed = self.old_speed
-        self.interlocking.insert_train_max_speed_changed(self.train.identifier)
+        self.interlocking.insert_train_max_speed_changed(self.train)
         self.logger.resolve_train_speed_fault(tick, self.configuration.id)