@@ -1866,7 +1866,10 @@ mod tests {
1866
1866
nodes[ 0 ]
1867
1867
. node
1868
1868
. force_close_broadcasting_latest_txn (
1869
- & ChannelId :: v1_from_funding_outpoint ( OutPoint { txid : tx. txid ( ) , index : 0 } ) ,
1869
+ & ChannelId :: v1_from_funding_outpoint ( OutPoint {
1870
+ txid : tx. compute_txid ( ) ,
1871
+ index : 0 ,
1872
+ } ) ,
1870
1873
& nodes[ 1 ] . node . get_our_node_id ( ) ,
1871
1874
error_message. to_string ( ) ,
1872
1875
)
@@ -2134,7 +2137,7 @@ mod tests {
2134
2137
get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendChannelUpdate , node_0_id) ;
2135
2138
let broadcast_funding =
2136
2139
nodes[ 0 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) . pop ( ) . unwrap ( ) ;
2137
- assert_eq ! ( broadcast_funding. txid ( ) , funding_tx. txid ( ) ) ;
2140
+ assert_eq ! ( broadcast_funding. compute_txid ( ) , funding_tx. compute_txid ( ) ) ;
2138
2141
assert ! ( nodes[ 0 ] . tx_broadcaster. txn_broadcasted. lock( ) . unwrap( ) . is_empty( ) ) ;
2139
2142
2140
2143
if !std:: thread:: panicking ( ) {
@@ -2212,7 +2215,7 @@ mod tests {
2212
2215
let sweep_tx_0 = nodes[ 0 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) . pop ( ) . unwrap ( ) ;
2213
2216
match tracked_output. status {
2214
2217
OutputSpendStatus :: PendingFirstConfirmation { latest_spending_tx, .. } => {
2215
- assert_eq ! ( sweep_tx_0. txid ( ) , latest_spending_tx. txid ( ) ) ;
2218
+ assert_eq ! ( sweep_tx_0. compute_txid ( ) , latest_spending_tx. compute_txid ( ) ) ;
2216
2219
} ,
2217
2220
_ => panic ! ( "Unexpected status" ) ,
2218
2221
}
@@ -2224,7 +2227,7 @@ mod tests {
2224
2227
let sweep_tx_1 = nodes[ 0 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) . pop ( ) . unwrap ( ) ;
2225
2228
match tracked_output. status {
2226
2229
OutputSpendStatus :: PendingFirstConfirmation { latest_spending_tx, .. } => {
2227
- assert_eq ! ( sweep_tx_1. txid ( ) , latest_spending_tx. txid ( ) ) ;
2230
+ assert_eq ! ( sweep_tx_1. compute_txid ( ) , latest_spending_tx. compute_txid ( ) ) ;
2228
2231
} ,
2229
2232
_ => panic ! ( "Unexpected status" ) ,
2230
2233
}
@@ -2236,7 +2239,7 @@ mod tests {
2236
2239
let sweep_tx_2 = nodes[ 0 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) . pop ( ) . unwrap ( ) ;
2237
2240
match tracked_output. status {
2238
2241
OutputSpendStatus :: PendingFirstConfirmation { latest_spending_tx, .. } => {
2239
- assert_eq ! ( sweep_tx_2. txid ( ) , latest_spending_tx. txid ( ) ) ;
2242
+ assert_eq ! ( sweep_tx_2. compute_txid ( ) , latest_spending_tx. compute_txid ( ) ) ;
2240
2243
} ,
2241
2244
_ => panic ! ( "Unexpected status" ) ,
2242
2245
}
@@ -2249,7 +2252,7 @@ mod tests {
2249
2252
let tracked_output = nodes[ 0 ] . sweeper . tracked_spendable_outputs ( ) . first ( ) . unwrap ( ) . clone ( ) ;
2250
2253
match tracked_output. status {
2251
2254
OutputSpendStatus :: PendingThresholdConfirmations { latest_spending_tx, .. } => {
2252
- assert_eq ! ( sweep_tx_2. txid ( ) , latest_spending_tx. txid ( ) ) ;
2255
+ assert_eq ! ( sweep_tx_2. compute_txid ( ) , latest_spending_tx. compute_txid ( ) ) ;
2253
2256
} ,
2254
2257
_ => panic ! ( "Unexpected status" ) ,
2255
2258
}
@@ -2264,7 +2267,7 @@ mod tests {
2264
2267
let tracked_output = nodes[ 0 ] . sweeper . tracked_spendable_outputs ( ) . first ( ) . unwrap ( ) . clone ( ) ;
2265
2268
match tracked_output. status {
2266
2269
OutputSpendStatus :: PendingThresholdConfirmations { latest_spending_tx, .. } => {
2267
- assert_eq ! ( sweep_tx_2. txid ( ) , latest_spending_tx. txid ( ) ) ;
2270
+ assert_eq ! ( sweep_tx_2. compute_txid ( ) , latest_spending_tx. compute_txid ( ) ) ;
2268
2271
} ,
2269
2272
_ => panic ! ( "Unexpected status" ) ,
2270
2273
}
0 commit comments