From f4cea72248034c53bd517798453f7bf441bc209c Mon Sep 17 00:00:00 2001 From: CleverThis Date: Fri, 15 May 2026 01:43:32 +0000 Subject: [PATCH] fix(ci): update all merge_invariants callers to use 4-param signature The PR #11143 adds action_invariants as a 4th parameter to merge_invariants() and InvariantSet.merge(), but two call sites were not updated: - benchmarks/invariant_merge_bench.py: 5 calls with 3 positional args - robot/helper_m3_e2e_verification.py: 2 calls using keyword args All call sites now pass action_invariants=[] for backward-compatible empty-action behavior. --- benchmarks/invariant_merge_bench.py | 10 +++++----- robot/helper_m3_e2e_verification.py | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/benchmarks/invariant_merge_bench.py b/benchmarks/invariant_merge_bench.py index d68db24cf..87e5e853b 100644 --- a/benchmarks/invariant_merge_bench.py +++ b/benchmarks/invariant_merge_bench.py @@ -74,7 +74,7 @@ class MergeSmallSuite: def time_merge_small(self) -> None: """Benchmark merge with ~13 invariants.""" - merge_invariants(self.plan, self.project, self.global_invs) + merge_invariants(self.plan, [], self.project, self.global_invs) class MergeMediumSuite: @@ -88,7 +88,7 @@ class MergeMediumSuite: def time_merge_medium(self) -> None: """Benchmark merge with ~50 invariants.""" - merge_invariants(self.plan, self.project, self.global_invs) + merge_invariants(self.plan, [], self.project, self.global_invs) class MergeLargeSuite: @@ -102,7 +102,7 @@ class MergeLargeSuite: def time_merge_large(self) -> None: """Benchmark merge with ~250 invariants.""" - merge_invariants(self.plan, self.project, self.global_invs) + merge_invariants(self.plan, [], self.project, self.global_invs) class MergeDeduplicationSuite: @@ -137,7 +137,7 @@ class MergeDeduplicationSuite: def time_merge_dedup(self) -> None: """Benchmark merge with 60 invariants, all duplicates.""" - merge_invariants(self.plan, self.project, self.global_invs) + merge_invariants(self.plan, [], self.project, self.global_invs) class InvariantSetMergeSuite: @@ -151,7 +151,7 @@ class InvariantSetMergeSuite: def time_invariant_set_merge(self) -> None: """Benchmark InvariantSet.merge().""" - InvariantSet.merge(self.plan, self.project, self.global_invs) + InvariantSet.merge(self.plan, [], self.project, self.global_invs) class ServiceEffectiveSuite: diff --git a/robot/helper_m3_e2e_verification.py b/robot/helper_m3_e2e_verification.py index bfd06a911..84e9d78c1 100644 --- a/robot/helper_m3_e2e_verification.py +++ b/robot/helper_m3_e2e_verification.py @@ -867,6 +867,7 @@ def invariants_enforced_during_strategize() -> None: merged = merge_invariants( plan_invariants=[plan_inv], + action_invariants=[], project_invariants=[project_inv], global_invariants=[global_inv], ) @@ -890,6 +891,7 @@ def invariants_enforced_during_strategize() -> None: invariant_set = InvariantSet.merge( plan_invariants=[plan_inv], + action_invariants=[], project_invariants=[project_inv], global_invariants=[global_inv], )