Merge pull request #5473

ddf7890 python-rpc: add missing getblock RPC parameters (moneromooo-monero)

2 files changed, 8 insertions, 6 deletions

diff --git a/tests/functional_tests/blockchain.py b/tests/functional_tests/blockchain.py
index 644597584..2bd7672c0 100755
--- a/tests/functional_tests/blockchain.py
+++ b/tests/functional_tests/blockchain.py
@@ -74,7 +74,7 @@ class BlockchainTest():
 
         # we should not see a block at height
         ok = False
-        try: daemon.getblock(height)
+        try: daemon.getblock(height = height)
         except: ok = True
         assert ok
 
@@ -92,7 +92,7 @@ class BlockchainTest():
         # get the blocks, check they have the right height
         res_getblock = []
         for n in range(blocks):
-            res_getblock.append(daemon.getblock(height + n))
+            res_getblock.append(daemon.getblock(height = height + n))
             block_header = res_getblock[n].block_header
             assert abs(block_header.timestamp - time.time()) < 10 # within 10 seconds
             assert block_header.height == height + n
@@ -111,7 +111,7 @@ class BlockchainTest():
 
         # we should not see a block after that
         ok = False
-        try: daemon.getblock(height + blocks)
+        try: daemon.getblock(height = height + blocks)
         except: ok = True
         assert ok
 
@@ -157,7 +157,7 @@ class BlockchainTest():
 
         # we should not see the popped block anymore
         ok = False
-        try: daemon.getblock(height + blocks - 1)
+        try: daemon.getblock(height = height + blocks - 1)
         except: ok = True
         assert ok
 
diff --git a/utils/python-rpc/framework/daemon.py b/utils/python-rpc/framework/daemon.py
index 04fc5b5cf..18ce37221 100644
--- a/utils/python-rpc/framework/daemon.py
+++ b/utils/python-rpc/framework/daemon.py
@@ -67,11 +67,13 @@ class Daemon(object):
         }    
         return self.rpc.send_json_rpc_request(submitblock)
 
-    def getblock(self, height=0):
+    def getblock(self, hash = '', height = 0, fill_pow_hash = False):
         getblock = {
             'method': 'getblock',
             'params': {
-                'height': height
+                'hash': hash,
+                'height': height,
+                'fill_pow_hash': fill_pow_hash,
             },
             'jsonrpc': '2.0', 
             'id': '0'