Fix cirq_quregs argument in composite_bloq (#962)

Pass kwargs as kwargs, otherwise, an extra dictionary layer is added.
Adds a test that exercises this.

Fixes: #955

Author: dstrain115

qualtran/_infra/composite_bloq.py

@@ -139,7 +139,7 @@ def as_cirq_op(
         import cirq
 
         circuit, out_quregs = self.to_cirq_circuit_and_quregs(
-            qubit_manager=qubit_manager, cirq_quregs=cirq_quregs
+            qubit_manager=qubit_manager, **cirq_quregs
         )
         return cirq.CircuitOperation(circuit), out_quregs
 

qualtran/_infra/controlled_test.py

@@ -22,6 +22,7 @@
 from qualtran import (
     Bloq,
     BloqBuilder,
+    CompositeBloq,
     Controlled,
     CtrlSpec,
     QBit,
@@ -130,6 +131,19 @@ def _test_cirq_equivalence(bloq: Bloq, gate: cirq.Gate):
     )
     cirq.testing.assert_same_circuits(circuit1, circuit2)
 
+    # controlled composite subbloqs
+    circuit = cirq.Circuit(cirq.X(cirq.LineQubit(0)))
+    cbloq = CompositeBloq.from_cirq_circuit(circuit).controlled().as_composite_bloq()
+    quregs = get_named_qubits(cbloq.signature.lefts())
+
+    circuit1 = cbloq.to_cirq_circuit(qubit_manager=None, cirq_quregs=quregs)
+    ctrl = quregs['ctrl'][0]
+    q = quregs['qubits'][0][0]
+    circuit2 = cirq.Circuit(
+        cirq.CircuitOperation(cirq.Circuit(cirq.X(q)).freeze()).controlled_by(ctrl)
+    )
+    cirq.testing.assert_same_circuits(circuit1, circuit2)
+
 
 def test_ctrl_spec_activation_1():
     cspec1 = CtrlSpec()