@@ -49,14 +49,17 @@ def run_test(self):
49
49
assert_equal (len (peers ), 1 )
50
50
peer_0_peer_1_id = peers [0 ]["id" ]
51
51
52
- self .log .info ("Arguments must be sensible" )
53
- assert_raises_rpc_error (- 8 , "hash must be of length 64 (not 4, for '1234')" , self .nodes [0 ].getblockfrompeer , "1234" , 0 )
52
+ self .log .info ("Arguments must be valid" )
53
+ assert_raises_rpc_error (- 8 , "hash must be of length 64 (not 4, for '1234')" , self .nodes [0 ].getblockfrompeer , "1234" , peer_0_peer_1_id )
54
+ assert_raises_rpc_error (- 1 , "JSON value is not a string as expected" , self .nodes [0 ].getblockfrompeer , 1234 , peer_0_peer_1_id )
55
+ assert_raises_rpc_error (- 1 , "JSON value is not an integer as expected" , self .nodes [0 ].getblockfrompeer , short_tip , "0" )
54
56
55
57
self .log .info ("We must already have the header" )
56
58
assert_raises_rpc_error (- 1 , "Block header missing" , self .nodes [0 ].getblockfrompeer , "00" * 32 , 0 )
57
59
58
60
self .log .info ("Non-existent peer generates error" )
59
- assert_raises_rpc_error (- 1 , "Peer does not exist" , self .nodes [0 ].getblockfrompeer , short_tip , peer_0_peer_1_id + 1 )
61
+ for peer_id in [- 1 , peer_0_peer_1_id + 1 ]:
62
+ assert_raises_rpc_error (- 1 , "Peer does not exist" , self .nodes [0 ].getblockfrompeer , short_tip , peer_id )
60
63
61
64
self .log .info ("Successful fetch" )
62
65
result = self .nodes [0 ].getblockfrompeer (short_tip , peer_0_peer_1_id )
0 commit comments