Merge branch 'development' of github.com:CityOfZion/neo-boa into deve…

…lopment
CityOfZion · Jan 1, 2018 · aad18d8 · aad18d8
2 parents 5cd185e + ea504e7
commit aad18d8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/boa/blockchain/vm/VMOp.py b/boa/blockchain/vm/VMOp.py
@@ -150,14 +150,6 @@ def ToName(op):
     for item in items:
         n = getattr(module, item)
 
-        try:
-            nn = int(binascii.hexlify(n))
-
-            if op == nn:
-                return item
-        except Exception as e:
-            pass
-
         try:
             nn2 = int.from_bytes(n, 'little')
             if op == nn2:

diff --git a/boa/code/module.py b/boa/code/module.py
@@ -537,21 +537,26 @@ def to_s(self):
                             pass
 
                 if pt.py_op == pyop.CALL_FUNCTION:
-                    old = to_label
-                    to_label = '%s %s %s' % (pt.func_name, pt.func_params, old)
+                    if to_label is None:
+                        old = ""
+                    else:
+                        old = to_label
+                    param_string = "("
+                    for param in pt.func_params:
+                        param_string += str(param.args) + ", "
+                    param_string = param_string.rstrip(", ") + ")"
+                    to_label = '%s %s %s' % (pt.func_name, param_string, old)
 
                 lno = "{:<10}".format(
                     pt.line_no if do_print_line_no or pstart else '')
                 addr = "{:<5}".format(key)
                 op = "{:<20}".format(str(pt.py_op))
-                try:
-                    # Check if it is an integer (this is likely a custom boa op)
-                    int(str(pt.py_op))
-                    opname = pyop.ToName(pt.py_op)
+
+                # If this is a number, it is likely a custom python opcode, get the name
+                if str(pt.py_op).isnumeric():
+                    opname = pyop.ToName(int(str(pt.py_op)))
                     if opname is not None:
                         op = "{:<20}".format(opname)
-                except ValueError:
-                    pass
 
                 arg = "{:<50}".format(
                     to_label if to_label is not None else pt.arg_s)

diff --git a/boa/code/pyop.py b/boa/code/pyop.py
@@ -199,4 +199,4 @@ def ToName(op):
         n = getattr(module, item)
         if op == n:
             return item
-        return None
+    return None