JSON-RPC output fixes

* Fixed the VMState output from JSON-RPC so it properly reflects the same string output as the C# implementation.

* Fixed integer value outputs so that they are represented as a String, which is consistent with the C# implementation.

* Fixed `ContractParameterType` outputs so that they use the String representation instead of a hex representation for consistency with the C# implementation.

CityOfZion#233

neo/SmartContract/ContractParameter.py

@@ -47,7 +47,7 @@ def ToParameter(item: StackItem):
             return ContractParameter(type=ContractParameterType.ByteArray, value=item.GetByteArray())
 
         elif isinstance(item, Integer):
-            return ContractParameter(type=ContractParameterType.Integer, value=item.GetBigInteger())
+            return ContractParameter(type=ContractParameterType.Integer, value=str(item.GetBigInteger()))
 
         elif isinstance(item, InteropInterface):
             return ContractParameter(type=ContractParameterType.InteropInterface, value=item.GetInterface())

neo/SmartContract/ContractParameterType.py

@@ -26,7 +26,7 @@ class ContractParameterType(Enum):
     Void = 0xff
 
     def __str__(self):
-        return str(self.value.to_bytes(1, 'little').hex())
+        return self.name
 
     @staticmethod
     def FromString(val):

neo/VM/VMState.py

@@ -3,3 +3,18 @@
 HALT = 1 << 0
 FAULT = 1 << 1
 BREAK = 1 << 2
+
+
+def VMStateStr(_VMState):
+    if _VMState == NONE:
+        return "NONE"
+
+    state = []
+    if _VMState & HALT:
+        state.append("HALT")
+    if _VMState & FAULT:
+        state.append("FAULT")
+    if _VMState & BREAK:
+        state.append("BREAK")
+
+    return ", ".join(state)

neo/api/JSONRPC/JsonRpcApi.py

@@ -29,6 +29,7 @@
 from neo.SmartContract.ApplicationEngine import ApplicationEngine
 from neo.SmartContract.ContractParameter import ContractParameter
 from neo.VM.ScriptBuilder import ScriptBuilder
+from neo.VM.VMState import VMStateStr
 
 
 class JsonRpcError(Exception):
@@ -288,7 +289,7 @@ def get_invoke_result(self, script):
         appengine = ApplicationEngine.Run(script=script)
         return {
             "script": script.decode('utf-8'),
-            "state": appengine.State,
+            "state": VMStateStr(appengine.State),
             "gas_consumed": appengine.GasConsumed().ToString(),
             "stack": [ContractParameter.ToParameter(item).ToJson() for item in appengine.EvaluationStack.Items]
         }

neo/api/JSONRPC/test_json_invoke_rpc_api.py

@@ -16,6 +16,7 @@
 from neocore.UInt160 import UInt160
 import binascii
 from neo.VM import VMState
+from neo.VM.VMState import VMStateStr
 
 
 def mock_request(body):
@@ -66,7 +67,7 @@ def test_invoke_1(self):
         req = self._gen_rpc_req("invoke", params=[contract_hash, jsn])
         mock_req = mock_request(json.dumps(req).encode("utf-8"))
         res = json.loads(self.app.home(mock_req))
-        self.assertEqual(res['result']['state'], VMState.HALT + VMState.BREAK)
+        self.assertEqual(res['result']['state'], VMStateStr(VMState.HALT + VMState.BREAK))
         self.assertEqual(res['result']['gas_consumed'], '0.205')
         results = []
         for p in res['result']['stack']:
@@ -95,7 +96,7 @@ def test_invoke_2(self):
         req = self._gen_rpc_req("invoke", params=[contract_hash, jsn])
         mock_req = mock_request(json.dumps(req).encode("utf-8"))
         res = json.loads(self.app.home(mock_req))
-        self.assertEqual(res['result']['state'], VMState.HALT + VMState.BREAK)
+        self.assertEqual(res['result']['state'], VMStateStr(VMState.HALT + VMState.BREAK))
         results = []
         for p in res['result']['stack']:
             results.append(ContractParameter.FromJson(p))
@@ -108,7 +109,7 @@ def test_invoke_3(self):
         req = self._gen_rpc_req("invokefunction", params=[contract_hash, 'symbol'])
         mock_req = mock_request(json.dumps(req).encode("utf-8"))
         res = json.loads(self.app.home(mock_req))
-        self.assertEqual(res['result']['state'], VMState.HALT + VMState.BREAK)
+        self.assertEqual(res['result']['state'], VMStateStr(VMState.HALT + VMState.BREAK))
         results = []
         for p in res['result']['stack']:
             results.append(ContractParameter.FromJson(p))
@@ -124,7 +125,7 @@ def test_invoke_4(self):
         req = self._gen_rpc_req("invokefunction", params=[contract_hash, 'balanceOf', params])
         mock_req = mock_request(json.dumps(req).encode("utf-8"))
         res = json.loads(self.app.home(mock_req))
-        self.assertEqual(res['result']['state'], VMState.HALT + VMState.BREAK)
+        self.assertEqual(res['result']['state'], VMStateStr(VMState.HALT + VMState.BREAK))
         results = []
         for p in res['result']['stack']:
             results.append(ContractParameter.FromJson(p))
@@ -137,7 +138,7 @@ def test_invoke_5(self):
         req = self._gen_rpc_req("invokescript", params=[test_script])
         mock_req = mock_request(json.dumps(req).encode("utf-8"))
         res = json.loads(self.app.home(mock_req))
-        self.assertEqual(res['result']['state'], VMState.HALT + VMState.BREAK)
+        self.assertEqual(res['result']['state'], VMStateStr(VMState.HALT + VMState.BREAK))
 
         results = []
         for p in res['result']['stack']: