monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5473

Browse source 
ddf7890 python-rpc: add missing getblock RPC parameters (moneromooo-monero)
This commit is contained in:
luigi1111 2019-07-24 13:55:12 -05:00
commit 4c4586ca7b
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/functional_tests/blockchain.py
View file

@ -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

6
utils/python-rpc/framework/daemon.py
View file

@ -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'