refactor(functional-tests): extract wait_for_l1_commitment helper

Move inline wait_until_with_value calls for L1 header commitments into
a dedicated StrataService.wait_for_l1_commitment() method, consistent
with existing wait_for_block_height/wait_for_block patterns.

Author: voidash

functional-tests-new/common/services/strata.py

@@ -195,6 +195,45 @@ def wait_for_additional_blocks(
         )
         return self.get_cur_block_height(rpc)
 
+    def wait_for_l1_commitment(
+        self,
+        height: int,
+        rpc: JsonRpcClient | None = None,
+        timeout: int = 60,
+        poll_interval: float = 0.5,
+        differs_from: object | None = None,
+    ) -> object:
+        """Wait for an L1 header commitment at a given height.
+
+        Args:
+            height: L1 block height to check.
+            rpc: Optional RPC client. If None, creates a new one.
+            timeout: Maximum time to wait in seconds.
+            poll_interval: How often to poll.
+            differs_from: If set, also require the commitment to differ
+                from this value (useful for reorg detection).
+
+        Returns:
+            The L1 header commitment value.
+        """
+        if rpc is None:
+            rpc = self.create_rpc()
+
+        def predicate(v):
+            if v is None:
+                return False
+            if differs_from is not None and v == differs_from:
+                return False
+            return True
+
+        return wait_until_with_value(
+            lambda: rpc.strata_getL1HeaderCommitment(height),
+            predicate,
+            error_with=f"No L1 header commitment at height {height}",
+            timeout=timeout,
+            step=poll_interval,
+        )
+
     def check_block_generation_in_range(self, rpc: JsonRpcClient, start: int, end: int) -> int:
         """Checks for range of blocks produced and returns current block height"""
         logger.info(f"Waiting for blocks from {start} to {end} be produced...")

functional-tests-new/tests/btcio/test_l1_connected.py

@@ -6,7 +6,6 @@
 
 from common.base_test import StrataNodeTest
 from common.config import ServiceType
-from common.wait import wait_until_with_value
 
 logger = logging.getLogger(__name__)
 
@@ -45,12 +44,7 @@ def main(self, ctx):
         check_height = tip_height - 2
         logger.info(f"Checking L1 header commitment at height {check_height}")
 
-        commitment = wait_until_with_value(
-            lambda: rpc.strata_getL1HeaderCommitment(check_height),
-            lambda v: v is not None,
-            timeout=30,
-            error_with=f"No L1 header commitment at height {check_height}",
-        )
+        commitment = strata.wait_for_l1_commitment(check_height, rpc=rpc, timeout=30)
 
         logger.info(f"L1 header commitment at {check_height}: {commitment}")
         return True

functional-tests-new/tests/btcio/test_l1_reorg.py

@@ -6,7 +6,6 @@
 
 from common.base_test import StrataNodeTest
 from common.config import ServiceType
-from common.wait import wait_until_with_value
 from envconfigs.strata import StrataEnvConfig
 
 logger = logging.getLogger(__name__)
@@ -45,11 +44,8 @@ def main(self, ctx):
         logger.info(f"Will invalidate from height {invalidate_height}")
 
         # wait for strata to have processed the block at this height
-        pre_reorg_commitment = wait_until_with_value(
-            lambda: rpc.strata_getL1HeaderCommitment(invalidate_height),
-            lambda v: v is not None,
-            timeout=60,
-            error_with=f"Strata not caught up to height {invalidate_height}",
+        pre_reorg_commitment = strata.wait_for_l1_commitment(
+            invalidate_height, rpc=rpc, timeout=60
         )
         logger.info(f"Pre-reorg commitment at {invalidate_height}: {pre_reorg_commitment}")
 
@@ -75,13 +71,11 @@ def main(self, ctx):
 
         # wait for strata to pick up the new chain; the commitment
         # at invalidate_height must differ from the pre-reorg value
-        post_reorg_commitment = wait_until_with_value(
-            lambda: rpc.strata_getL1HeaderCommitment(invalidate_height),
-            lambda v: v is not None and v != pre_reorg_commitment,
+        post_reorg_commitment = strata.wait_for_l1_commitment(
+            invalidate_height,
+            rpc=rpc,
             timeout=60,
-            error_with=(
-                f"Strata did not update commitment at height {invalidate_height} after reorg"
-            ),
+            differs_from=pre_reorg_commitment,
         )
         logger.info(f"Post-reorg commitment at {invalidate_height}: {post_reorg_commitment}")
 

functional-tests-new/tests/btcio/test_l1_tracking.py

@@ -6,7 +6,6 @@
 
 from common.base_test import StrataNodeTest
 from common.config import ServiceType
-from common.wait import wait_until_with_value
 
 logger = logging.getLogger(__name__)
 
@@ -38,12 +37,7 @@ def main(self, ctx):
         logger.info(f"Bitcoin tip before mining: {pre_tip}")
 
         # Wait for strata to have caught up to pre_tip
-        wait_until_with_value(
-            lambda: rpc.strata_getL1HeaderCommitment(pre_tip),
-            lambda v: v is not None,
-            timeout=60,
-            error_with=f"Strata not caught up to L1 height {pre_tip}",
-        )
+        strata.wait_for_l1_commitment(pre_tip, rpc=rpc, timeout=60)
 
         # Mine additional blocks
         addr = btc_rpc.proxy.getnewaddress()
@@ -55,12 +49,7 @@ def main(self, ctx):
             raise AssertionError(f"Expected tip {pre_tip + self.EXTRA_BLOCKS}, got {post_tip}")
 
         # Wait for strata to pick up the new blocks
-        commitment = wait_until_with_value(
-            lambda: rpc.strata_getL1HeaderCommitment(post_tip),
-            lambda v: v is not None,
-            timeout=60,
-            error_with=f"Strata did not track new L1 blocks up to height {post_tip}",
-        )
+        commitment = strata.wait_for_l1_commitment(post_tip, rpc=rpc, timeout=60)
         logger.info(f"L1 header commitment at new tip {post_tip}: {commitment}")
 
         # Verify intermediate heights also have commitments