op-e2e: Use a long timeout when waiting for next block and keep test code simple.

op-e2e/e2eutils/wait/blocks.go

@@ -49,18 +49,11 @@ func ForBlockWithTimestamp(ctx context.Context, client BlockCaller, target uint6
 
 func ForNextBlock(ctx context.Context, client BlockCaller) error {
 	current, err := client.BlockNumber(ctx)
-	if err != nil {
-		return fmt.Errorf("get starting block number: %w", err)
-	}
-	return ForBlock(ctx, client, current+1)
-}
-
-func ForNextBlockWithTimeout(ctx context.Context, client BlockCaller, timeout time.Duration) error {
-	timeoutCtx, cancel := context.WithTimeout(ctx, timeout)
+	// Long timeout so we don't have to care what the block time is. If the test passes this will complete early anyway.
+	ctx, cancel := context.WithTimeout(ctx, 60*time.Second)
 	defer cancel()
-	current, err := client.BlockNumber(ctx)
 	if err != nil {
 		return fmt.Errorf("get starting block number: %w", err)
 	}
-	return ForBlock(timeoutCtx, client, current+1)
+	return ForBlock(ctx, client, current+1)
 }

op-e2e/system_adminrpc_test.go

@@ -37,7 +37,7 @@ func TestStopStartSequencer(t *testing.T) {
 
 	require.NoError(
 		t,
-		wait.ForNextBlockWithTimeout(ctx, l2Seq, time.Duration(cfg.DeployConfig.L2BlockTime+1)*2*time.Second),
+		wait.ForNextBlock(ctx, l2Seq),
 		"Chain did not advance after starting sequencer",
 	)
 
@@ -70,7 +70,7 @@ func TestStopStartSequencer(t *testing.T) {
 
 	require.NoError(
 		t,
-		wait.ForNextBlockWithTimeout(ctx, l2Seq, time.Duration(cfg.DeployConfig.L2BlockTime+1)*2*time.Second),
+		wait.ForNextBlock(ctx, l2Seq),
 		"Chain did not advance after starting sequencer",
 	)
 }