JsonRpcApi: getrawmempool fixes

CityOfZion · Jan 23, 2018 · a02a61d · a02a61d
1 parent d202472
commit a02a61d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/neo/api/JSONRPC/JsonRpcApi.py b/neo/api/JSONRPC/JsonRpcApi.py
@@ -198,7 +198,7 @@ def json_rpc_method_handler(self, method, params):
             #     return contract.ToJson()
 
         elif method == "getrawmempool":
-            return list(map(lambda hash: hash.decode('utf-8'), NodeLeader.Instance().MemPool.keys()))
+            return list(map(lambda hash: "0x%s" % hash.decode('utf-8'), NodeLeader.Instance().MemPool.keys()))
 
         elif method == "getversion":
             return {

diff --git a/neo/api/JSONRPC/test_json_rpc_api.py b/neo/api/JSONRPC/test_json_rpc_api.py
@@ -209,7 +209,14 @@ def test_get_raw_mempool(self):
         req = self._gen_rpc_req("getrawmempool", params=[])
         mock_req = mock_request(json.dumps(req).encode("utf-8"))
         res = json.loads(self.app.home(mock_req))
-        self.assertEqual(res['result'], [])
+        mempool = res['result']
+
+        # when running only these tests, mempool is empty. when running all tests, there are a
+        # number of entries
+        if len(mempool) > 0:
+            for entry in mempool:
+                self.assertEqual(entry[0:2], "0x")
+                self.assertEqual(len(entry), 66)
 
     def test_get_version(self):
         # TODO: what's the nonce? on testnet live server response it's always 771199013