@@ -7002,7 +7002,7 @@ impl<SP: Deref> FundedChannel<SP> where
70027002 log_trace!(logger, "Regenerating latest commitment update in channel {} with{} {} update_adds, {} update_fulfills, {} update_fails, and {} update_fail_malformeds",
70037003 &self.context.channel_id(), if update_fee.is_some() { " update_fee," } else { "" },
70047004 update_add_htlcs.len(), update_fulfill_htlcs.len(), update_fail_htlcs.len(), update_fail_malformed_htlcs.len());
7005- let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger).map(|(cu, _)| cu) {
7005+ let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger) {
70067006 if self.context.signer_pending_commitment_update {
70077007 log_trace!(logger, "Commitment update generated: clearing signer_pending_commitment_update");
70087008 self.context.signer_pending_commitment_update = false;
@@ -8917,7 +8917,7 @@ impl<SP: Deref> FundedChannel<SP> where
89178917
89188918 /// Only fails in case of signer rejection. Used for channel_reestablish commitment_signed
89198919 /// generation when we shouldn't change HTLC/channel state.
8920- fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<( msgs::CommitmentSigned, (Txid, Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)>)) , ChannelError> where L::Target: Logger {
8920+ fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<msgs::CommitmentSigned, ChannelError> where L::Target: Logger {
89218921 // Get the fee tests from `build_commitment_no_state_update`
89228922 #[cfg(any(test, fuzzing))]
89238923 self.build_commitment_no_state_update(logger);
@@ -8960,14 +8960,14 @@ impl<SP: Deref> FundedChannel<SP> where
89608960 }
89618961 }
89628962
8963- Ok(( msgs::CommitmentSigned {
8963+ Ok(msgs::CommitmentSigned {
89648964 channel_id: self.context.channel_id,
89658965 signature,
89668966 htlc_signatures,
89678967 batch: None,
89688968 #[cfg(taproot)]
89698969 partial_signature_with_nonce: None,
8970- }, (counterparty_commitment_txid, commitment_stats.htlcs_included)) )
8970+ })
89718971 },
89728972 // TODO (taproot|arik)
89738973 #[cfg(taproot)]
0 commit comments