highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-01 19:21:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Improve getblock error message for invalid data type.

Browse Source
This commit is contained in:
klementtan
2021-04-17 19:08:47 +08:00
parent f5e8bcf985
commit a411494261
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rpc/blockchain.cpp
View File

@ -936,10 +936,11 @@ static RPCHelpMan getblock()
int verbosity = 1; int verbosity = 1;
if (!request.params[1].isNull()) { if (!request.params[1].isNull()) {
if(request.params[1].isNum()) if (request.params[1].isBool()) {
verbosity = request.params[1].get_int();
else
verbosity = request.params[1].get_bool() ? 1 : 0; verbosity = request.params[1].get_bool() ? 1 : 0;
} else {
verbosity = request.params[1].get_int();
}
} }
CBlock block; CBlock block;

3
test/functional/rpc_blockchain.py
View File

@ -410,6 +410,9 @@ class BlockchainTest(BitcoinTestFramework):
self.log.info("Test that getblock with verbosity 2 still works with pruned Undo data") self.log.info("Test that getblock with verbosity 2 still works with pruned Undo data")
datadir = get_datadir_path(self.options.tmpdir, 0) datadir = get_datadir_path(self.options.tmpdir, 0)
self.log.info("Test that getblock with invalid verbosity type returns proper error message")
assert_raises_rpc_error(-1, "JSON value is not an integer as expected", node.getblock, blockhash, "2")
def move_block_file(old, new): def move_block_file(old, new):
old_path = os.path.join(datadir, self.chain, 'blocks', old) old_path = os.path.join(datadir, self.chain, 'blocks', old)
new_path = os.path.join(datadir, self.chain, 'blocks', new) new_path = os.path.join(datadir, self.chain, 'blocks', new)