Test for hex strings and remove stray newline from rpc_named_arguments.

tecnovert · Fuzzbawls · commit ba310d1d34d1 · 2022-11-21T19:08:47.000-08:00
Github-Pull: #2779 Rebased-From: 8488f7e
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -114,11 +114,12 @@ def _test_getblock(self):
 
         # Test getblock verbosity
         besthash = node.getbestblockhash()
-        assert(isinstance(node.getblock(blockhash=besthash, verbose=False), str))
-        assert(isinstance(node.getblock(blockhash=besthash, verbosity=0), str))
-        assert(isinstance(node.getblock(besthash, 1)['tx'][0], str))
-        assert(isinstance(node.getblock(besthash, True)['tx'][0], str))
-        assert('vin' in node.getblock(besthash, 2)['tx'][0])
+        assert_is_hex_string(node.getblock(blockhash=besthash, verbose=False))
+        assert_is_hex_string(node.getblock(blockhash=besthash, verbosity=0))
+
+        assert_is_hash_string(node.getblock(besthash, 1)['tx'][0])
+        assert_is_hash_string(node.getblock(besthash, True)['tx'][0])
+        assert_is_hex_string(node.getblock(besthash, 2)['tx'][0]['vin'][0]['coinbase']);
 
 
 if __name__ == '__main__':
diff --git a/test/functional/rpc_named_arguments.py b/test/functional/rpc_named_arguments.py
@@ -30,6 +30,5 @@ def run_test(self):
         assert_equal(node.echo(arg9=None), [None]*10)
         assert_equal(node.echo(arg0=0,arg3=3,arg9=9), [0] + [None]*2 + [3] + [None]*5 + [9])
 
-
 if __name__ == '__main__':
     NamedArgumentTest().main()
