@@ -7494,7 +7494,6 @@ where
74947494 false,
74957495 Vec::new(),
74967496 Vec::new(),
7497- Vec::new(),
74987497 logger,
74997498 );
75007499 UpdateFulfillCommitFetch::NewClaim { monitor_update, htlc_value_msat }
@@ -7932,15 +7931,7 @@ where
79327931 &self.context.channel_id()
79337932 );
79347933
7935- self.monitor_updating_paused(
7936- false,
7937- false,
7938- false,
7939- Vec::new(),
7940- Vec::new(),
7941- Vec::new(),
7942- logger,
7943- );
7934+ self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), logger);
79447935 self.context
79457936 .interactive_tx_signing_session
79467937 .as_mut()
@@ -8048,15 +8039,7 @@ where
80488039 .as_mut()
80498040 .expect("Signing session must exist for negotiated pending splice")
80508041 .received_commitment_signed();
8051- self.monitor_updating_paused(
8052- false,
8053- false,
8054- false,
8055- Vec::new(),
8056- Vec::new(),
8057- Vec::new(),
8058- logger,
8059- );
8042+ self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), logger);
80608043
80618044 Ok(self.push_ret_blockable_mon_update(monitor_update))
80628045 }
@@ -8367,7 +8350,6 @@ where
83678350 false,
83688351 Vec::new(),
83698352 Vec::new(),
8370- Vec::new(),
83718353 logger,
83728354 );
83738355 return Ok(self.push_ret_blockable_mon_update(monitor_update));
@@ -8574,15 +8556,7 @@ where
85748556 if update_fee.is_some() { "a fee update, " } else { "" },
85758557 update_add_count, update_fulfill_count, update_fail_count);
85768558
8577- self.monitor_updating_paused(
8578- false,
8579- true,
8580- false,
8581- Vec::new(),
8582- Vec::new(),
8583- Vec::new(),
8584- logger,
8585- );
8559+ self.monitor_updating_paused(false, true, false, Vec::new(), Vec::new(), logger);
85868560 (self.push_ret_blockable_mon_update(monitor_update), htlcs_to_fail)
85878561 } else {
85888562 (None, Vec::new())
@@ -8717,7 +8691,6 @@ where
87178691 }
87188692
87198693 log_trace!(logger, "Updating HTLCs on receipt of RAA...");
8720- let mut to_forward_infos = Vec::new();
87218694 let mut pending_update_adds = Vec::new();
87228695 let mut revoked_htlcs = Vec::new();
87238696 let mut finalized_claimed_htlcs = Vec::new();
@@ -8918,7 +8891,6 @@ where
89188891 false,
89198892 true,
89208893 false,
8921- to_forward_infos,
89228894 revoked_htlcs,
89238895 finalized_claimed_htlcs,
89248896 logger,
@@ -8966,7 +8938,6 @@ where
89668938 false,
89678939 true,
89688940 false,
8969- to_forward_infos,
89708941 revoked_htlcs,
89718942 finalized_claimed_htlcs,
89728943 logger,
@@ -8980,7 +8951,6 @@ where
89808951 false,
89818952 false,
89828953 false,
8983- to_forward_infos,
89848954 revoked_htlcs,
89858955 finalized_claimed_htlcs,
89868956 logger,
@@ -9386,7 +9356,6 @@ where
93869356 /// [`ChannelMonitorUpdateStatus::InProgress`]: crate::chain::ChannelMonitorUpdateStatus::InProgress
93879357 fn monitor_updating_paused<L: Deref>(
93889358 &mut self, resend_raa: bool, resend_commitment: bool, resend_channel_ready: bool,
9389- pending_forwards: Vec<(PendingHTLCInfo, u64)>,
93909359 pending_fails: Vec<(HTLCSource, PaymentHash, HTLCFailReason)>,
93919360 pending_finalized_claimed_htlcs: Vec<(HTLCSource, Option<AttributionData>)>, logger: &L,
93929361 ) where
@@ -9397,7 +9366,6 @@ where
93979366 self.context.monitor_pending_revoke_and_ack |= resend_raa;
93989367 self.context.monitor_pending_commitment_signed |= resend_commitment;
93999368 self.context.monitor_pending_channel_ready |= resend_channel_ready;
9400- self.context.monitor_pending_forwards.extend(pending_forwards);
94019369 self.context.monitor_pending_failures.extend(pending_fails);
94029370 self.context.monitor_pending_finalized_fulfills.extend(pending_finalized_claimed_htlcs);
94039371 self.context.channel_state.set_monitor_update_in_progress();
@@ -10564,15 +10532,7 @@ where
1056410532 }],
1056510533 channel_id: Some(self.context.channel_id()),
1056610534 };
10567- self.monitor_updating_paused(
10568- false,
10569- false,
10570- false,
10571- Vec::new(),
10572- Vec::new(),
10573- Vec::new(),
10574- logger,
10575- );
10535+ self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), logger);
1057610536 self.push_ret_blockable_mon_update(monitor_update)
1057710537 } else {
1057810538 None
@@ -11329,15 +11289,7 @@ where
1132911289 }],
1133011290 channel_id: Some(self.context.channel_id()),
1133111291 };
11332- self.monitor_updating_paused(
11333- false,
11334- false,
11335- false,
11336- Vec::new(),
11337- Vec::new(),
11338- Vec::new(),
11339- logger,
11340- );
11292+ self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), logger);
1134111293 let monitor_update = self.push_ret_blockable_mon_update(monitor_update);
1134211294
1134311295 let announcement_sigs =
@@ -13061,15 +13013,7 @@ where
1306113013 let can_add_htlc = send_res.map_err(|(_, msg)| ChannelError::Ignore(msg))?;
1306213014 if can_add_htlc {
1306313015 let monitor_update = self.build_commitment_no_status_check(logger);
13064- self.monitor_updating_paused(
13065- false,
13066- true,
13067- false,
13068- Vec::new(),
13069- Vec::new(),
13070- Vec::new(),
13071- logger,
13072- );
13016+ self.monitor_updating_paused(false, true, false, Vec::new(), Vec::new(), logger);
1307313017 Ok(self.push_ret_blockable_mon_update(monitor_update))
1307413018 } else {
1307513019 Ok(None)
@@ -13192,15 +13136,7 @@ where
1319213136 }],
1319313137 channel_id: Some(self.context.channel_id()),
1319413138 };
13195- self.monitor_updating_paused(
13196- false,
13197- false,
13198- false,
13199- Vec::new(),
13200- Vec::new(),
13201- Vec::new(),
13202- &&logger,
13203- );
13139+ self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), &&logger);
1320413140 self.push_ret_blockable_mon_update(monitor_update)
1320513141 } else {
1320613142 None
@@ -13835,7 +13771,6 @@ where
1383513771 need_channel_ready,
1383613772 Vec::new(),
1383713773 Vec::new(),
13838- Vec::new(),
1383913774 logger,
1384013775 );
1384113776 Ok((channel, channel_monitor))
@@ -14157,7 +14092,6 @@ where
1415714092 need_channel_ready,
1415814093 Vec::new(),
1415914094 Vec::new(),
14160- Vec::new(),
1416114095 logger,
1416214096 );
1416314097
0 commit comments