diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-09-24 14:54:10 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-09-24 15:09:11 -0400 |
| commit | 37612099ec7314b15a07d8bac55161ed4e8e7491 (patch) | |
| tree | b5c5013246a6598aad46cf244ac3a2dbd8ed1cc0 /test/functional/p2p_compactblocks.py | |
| parent | 985d28cc90eda7f637b47cda78e74099d3df8734 (diff) | |
| parent | 5eb20f81d9568284dca735e4f770f41a48aa5660 (diff) | |
Merge #13424: Consistently validate txid / blockhash length and encoding in rpc calls
5eb20f81d9 Consistently use ParseHashV to validate hash inputs in rpc (Ben Woosley)
Pull request description:
ParseHashV validates the length and encoding of the string and throws
an informative RPC error on failure, which is as good or better than
these alternative calls.
Note I switched ParseHashV to check string length first, because
IsHex tests that the length is even, and an error like:
"must be of length 64 (not 63, for X)" is much more informative than
"must be hexadecimal string (not X)" in that case.
Split from #13420
Tree-SHA512: f0786b41c0d7793ff76e4b2bb35547873070bbf7561d510029e8edb93f59176277efcd4d183b3185532ea69fc0bbbf3dbe9e19362e8017007ae9d51266cd78ae
Diffstat (limited to 'test/functional/p2p_compactblocks.py')
| -rwxr-xr-x | test/functional/p2p_compactblocks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py index 3a5bdf806b..fafc27d16a 100755 --- a/test/functional/p2p_compactblocks.py +++ b/test/functional/p2p_compactblocks.py @@ -293,7 +293,7 @@ class CompactBlocksTest(BitcoinTestFramework): block_hash = int(node.generate(1)[0], 16) # Store the raw block in our internal format. - block = FromHex(CBlock(), node.getblock("%02x" % block_hash, False)) + block = FromHex(CBlock(), node.getblock("%064x" % block_hash, False)) for tx in block.vtx: tx.calc_sha256() block.rehash() |