diff options
| author | Ben Woosley <ben.woosley@gmail.com> | 2018-06-08 11:16:07 -0700 |
|---|---|---|
| committer | Ben Woosley <ben.woosley@gmail.com> | 2018-08-07 12:47:39 -0400 |
| commit | 5eb20f81d9568284dca735e4f770f41a48aa5660 (patch) | |
| tree | b0cddba3e535af76c852d57816d84f5335b15a6d /test/functional/wallet_basic.py | |
| parent | 56f69360dc98bd68704f19646a84d045788d199e (diff) | |
| download | bitcoin-5eb20f81d9568284dca735e4f770f41a48aa5660.tar.xz | |
Consistently use ParseHashV to validate hash inputs in rpc
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)"
Diffstat (limited to 'test/functional/wallet_basic.py')
| -rwxr-xr-x | test/functional/wallet_basic.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py index 9c58b84819..add7b7629d 100755 --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -122,9 +122,15 @@ class WalletTest(BitcoinTestFramework): assert_equal([unspent_0], self.nodes[2].listlockunspent()) self.nodes[2].lockunspent(True, [unspent_0]) assert_equal(len(self.nodes[2].listlockunspent()), 0) - assert_raises_rpc_error(-8, "Invalid parameter, unknown transaction", + assert_raises_rpc_error(-8, "txid must be of length 64 (not 34, for '0000000000000000000000000000000000')", self.nodes[2].lockunspent, False, [{"txid": "0000000000000000000000000000000000", "vout": 0}]) + assert_raises_rpc_error(-8, "txid must be hexadecimal string (not 'ZZZ0000000000000000000000000000000000000000000000000000000000000')", + self.nodes[2].lockunspent, False, + [{"txid": "ZZZ0000000000000000000000000000000000000000000000000000000000000", "vout": 0}]) + assert_raises_rpc_error(-8, "Invalid parameter, unknown transaction", + self.nodes[2].lockunspent, False, + [{"txid": "0000000000000000000000000000000000000000000000000000000000000000", "vout": 0}]) assert_raises_rpc_error(-8, "Invalid parameter, vout index out of bounds", self.nodes[2].lockunspent, False, [{"txid": unspent_0["txid"], "vout": 999}]) |