@@ -22,12 +22,12 @@ def setup_network (self):
22
22
self .is_network_split = False
23
23
self .sync_all ()
24
24
25
- def expect_found (self , node , txid ):
26
- data = node .getrawtransaction (txid , 1 )
27
- assert_equal (data ["txid" ], txid )
25
+ def expect_found (self , node , key , value ):
26
+ data = node .getrawtransaction (value , 1 )
27
+ assert_equal (data [key ], value )
28
28
29
- def expect_not_found (self , node , txid ):
30
- assert_raises (JSONRPCException , node .getrawtransaction , txid )
29
+ def expect_not_found (self , node , value ):
30
+ assert_raises (JSONRPCException , node .getrawtransaction , value )
31
31
32
32
def run_test (self ):
33
33
self .nodes [0 ].setgenerate (True , 30 )
@@ -46,21 +46,25 @@ def run_test (self):
46
46
tx = self .nodes [0 ].createrawtransaction (inputs , {addr : value - 1 })
47
47
signed = self .nodes [0 ].signrawtransaction (tx )
48
48
assert_equal (signed ["complete" ], True )
49
- txid = self .nodes [0 ].sendrawtransaction (signed ["hex" ])
49
+ self .nodes [0 ].sendrawtransaction (signed ["hex" ])
50
+ data = self .nodes [0 ].decoderawtransaction (signed ["hex" ])
51
+ txid = data ["txid" ]
52
+ bareTxid = data ["baretxid" ]
50
53
sync_mempools (self .nodes )
51
54
52
55
print ("Lookup through mempool..." )
53
56
for n in self .nodes :
54
57
assert_equal (n .getrawmempool (), [txid ])
55
- self .expect_found (n , txid )
58
+ self .expect_found (n , "txid" , txid )
59
+ self .expect_found (n , "baretxid" , bareTxid )
56
60
57
61
print ("Lookup through UTXO set..." )
58
62
self .nodes [0 ].setgenerate (True , 1 )
59
63
sync_blocks (self .nodes )
60
64
for n in self .nodes :
61
65
assert_equal (n .getrawmempool (), [])
62
66
assert n .gettxout (txid , 0 ) is not None
63
- self .expect_found (n , txid )
67
+ self .expect_found (n , "txid" , txid )
64
68
65
69
print ("Spending test output..." )
66
70
tx = self .nodes [0 ].createrawtransaction ([{"txid" : txid , "vout" : 0 }], {addr : value - 2 })
@@ -74,8 +78,10 @@ def run_test (self):
74
78
for n in self .nodes :
75
79
assert_equal (n .getrawmempool (), [])
76
80
assert_equal (n .gettxout (txid , 0 ), None )
77
- self .expect_found (self .nodes [0 ], txid )
81
+ self .expect_found (self .nodes [0 ], "txid" , txid )
82
+ self .expect_found (self .nodes [0 ], "baretxid" , bareTxid )
78
83
self .expect_not_found (self .nodes [1 ], txid )
84
+ self .expect_not_found (self .nodes [1 ], bareTxid )
79
85
80
86
81
87
if __name__ == '__main__' :
0 commit comments