Fix lint in controlled circuit and Instruction.definition change (qiskit-community/qiskit-aqua#1100)

* Fix lint in controlled circuit

* Fixed change to Instruction.definition

Author: manoelmarques

qiskit/aqua/operators/primitive_ops/circuit_op.py

@@ -223,7 +223,8 @@ def reduce(self) -> OperatorBase:
                 # Check if Identity or empty instruction (need to check that type is exactly
                 # Instruction because some gates have lazy gate.definition population)
                 # pylint: disable=unidiomatic-typecheck
-                if isinstance(gate, IGate) or (type(gate) == Instruction and gate.definition == []):
+                if isinstance(gate, IGate) or (type(gate) == Instruction and
+                                               gate.definition.data == []):
                     del self.primitive.data[i]  # type: ignore
         return self
 

qiskit/aqua/operators/state_fns/circuit_state_fn.py

@@ -349,7 +349,8 @@ def reduce(self) -> OperatorBase:
                 # Check if Identity or empty instruction (need to check that type is exactly
                 # Instruction because some gates have lazy gate.definition population)
                 # pylint: disable=unidiomatic-typecheck
-                if isinstance(gate, IGate) or (type(gate) == Instruction and gate.definition == []):
+                if isinstance(gate, IGate) or (type(gate) == Instruction and
+                                               gate.definition.data == []):
                     del self.primitive.data[i]
         return self
 

qiskit/aqua/utils/controlled_circuit.py

@@ -122,7 +122,7 @@ def get_controlled_circuit(circuit, ctl_qubit, tgt_circuit=None, use_basis_gates
         elif op[0].name == 'u3':
             apply_cu3(qc, *op[0].params, ctl_qubit, op[1][0], use_basis_gates=use_basis_gates)
         elif op[0].name == 'cx':
-            apply_ccx(qc, ctl_qubit, *op[1], use_basis_gates=use_basis_gates)
+            apply_ccx(qc, ctl_qubit, op[1][0], op[1][1], use_basis_gates=use_basis_gates)
         elif op[0].name == 'measure':
             qc.measure(op[1], op[2])
         elif op[0].name == 'barrier':