@@ -2383,16 +2383,14 @@ impl ChannelMonitor {
2383
2383
}
2384
2384
}
2385
2385
}
2386
- let mut pending_claims = Vec :: new ( ) ;
2387
2386
if let Some ( ref cur_local_tx) = self . current_local_signed_commitment_tx {
2388
2387
if self . would_broadcast_at_height ( height) {
2389
2388
log_trace ! ( self , "Broadcast onchain {}" , log_tx!( cur_local_tx. tx) ) ;
2390
2389
broadcaster. broadcast_transaction ( & cur_local_tx. tx ) ;
2391
2390
match self . key_storage {
2392
2391
Storage :: Local { ref delayed_payment_base_key, ref latest_per_commitment_point, .. } => {
2393
- let ( txs, mut spendable_output, new_outputs, mut pending_txn ) = self . broadcast_by_local_state ( & cur_local_tx, latest_per_commitment_point, & Some ( * delayed_payment_base_key) , height) ;
2392
+ let ( txs, mut spendable_output, new_outputs, _ ) = self . broadcast_by_local_state ( & cur_local_tx, latest_per_commitment_point, & Some ( * delayed_payment_base_key) , height) ;
2394
2393
spendable_outputs. append ( & mut spendable_output) ;
2395
- pending_claims. append ( & mut pending_txn) ;
2396
2394
if !new_outputs. is_empty ( ) {
2397
2395
watch_outputs. push ( ( cur_local_tx. txid . clone ( ) , new_outputs) ) ;
2398
2396
}
@@ -2402,9 +2400,8 @@ impl ChannelMonitor {
2402
2400
}
2403
2401
} ,
2404
2402
Storage :: Watchtower { .. } => {
2405
- let ( txs, mut spendable_output, new_outputs, mut pending_txn ) = self . broadcast_by_local_state ( & cur_local_tx, & None , & None , height) ;
2403
+ let ( txs, mut spendable_output, new_outputs, _ ) = self . broadcast_by_local_state ( & cur_local_tx, & None , & None , height) ;
2406
2404
spendable_outputs. append ( & mut spendable_output) ;
2407
- pending_claims. append ( & mut pending_txn) ;
2408
2405
if !new_outputs. is_empty ( ) {
2409
2406
watch_outputs. push ( ( cur_local_tx. txid . clone ( ) , new_outputs) ) ;
2410
2407
}
@@ -2416,12 +2413,6 @@ impl ChannelMonitor {
2416
2413
}
2417
2414
}
2418
2415
}
2419
- for claim in pending_claims {
2420
- match self . pending_claim_requests . entry ( claim. 0 ) {
2421
- hash_map:: Entry :: Occupied ( _) => { } ,
2422
- hash_map:: Entry :: Vacant ( entry) => { entry. insert ( claim. 1 ) ; }
2423
- }
2424
- }
2425
2416
if let Some ( events) = self . onchain_events_waiting_threshold_conf . remove ( & height) {
2426
2417
for ev in events {
2427
2418
match ev {
0 commit comments