Merge pull request #228 from BQSKit/update-qiskit-tests

Updated .qasm() to qasm2.dumps

Author: edyounis

bqskit/ext/qiskit/translate.py

@@ -5,13 +5,14 @@
 if TYPE_CHECKING:
     from qiskit import QuantumCircuit
 
+from qiskit import qasm2
 from bqskit.ir.circuit import Circuit
 from bqskit.ir.lang.qasm2 import OPENQASM2Language
 
 
 def qiskit_to_bqskit(qc: QuantumCircuit) -> Circuit:
     """Convert Qiskit's QuantumCircuit `qc` to a BQSKit Circuit."""
-    circuit = OPENQASM2Language().decode(qc.qasm())
+    circuit = OPENQASM2Language().decode(qasm2.dumps(qc))
     # circuit.renumber_qudits(list(reversed(range(circuit.num_qudits))))
     return circuit
     # TODO: support gates not captured by qasm

tests/ext/test_qiskit.py

@@ -44,21 +44,21 @@ def bqskit_circuit(self) -> Circuit:
     @pytest.fixture
     def qiskit_circuit(self) -> QuantumCircuit:
         circuit = QuantumCircuit(3)
-        circuit.cnot(0, 1)
+        circuit.cx(0, 1)
         circuit.u(1, 2, 3, 0)
         circuit.u(1, 2, 3, 1)
         circuit.u(1, 2, 3, 2)
-        circuit.cnot(0, 1)
-        circuit.cnot(0, 2)
-        circuit.cnot(0, 2)
+        circuit.cx(0, 1)
+        circuit.cx(0, 2)
+        circuit.cx(0, 2)
         circuit.u(1, 2.4, 3, 0)
         circuit.u(1, 2.2, 3, 1)
         circuit.u(1, 2.1, 3, 2)
         circuit.u(1, 2.1, 3, 2)
-        circuit.cnot(0, 2)
-        circuit.cnot(0, 2)
-        circuit.cnot(0, 1)
-        circuit.cnot(0, 2)
+        circuit.cx(0, 2)
+        circuit.cx(0, 2)
+        circuit.cx(0, 1)
+        circuit.cx(0, 2)
         circuit.u(1, 2.4, 3, 0)
         circuit.u(1, 2.2, 3, 1)
         circuit.u(1, 2.1, 3, 2)