@@ -6950,7 +6950,7 @@ impl<SP: Deref> FundedChannel<SP> where
69506950 log_trace!(logger, "Regenerating latest commitment update in channel {} with{} {} update_adds, {} update_fulfills, {} update_fails, and {} update_fail_malformeds",
69516951 &self.context.channel_id(), if update_fee.is_some() { " update_fee," } else { "" },
69526952 update_add_htlcs.len(), update_fulfill_htlcs.len(), update_fail_htlcs.len(), update_fail_malformed_htlcs.len());
6953- let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger).map(|(cu, _)| cu) {
6953+ let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger) {
69546954 if self.context.signer_pending_commitment_update {
69556955 log_trace!(logger, "Commitment update generated: clearing signer_pending_commitment_update");
69566956 self.context.signer_pending_commitment_update = false;
@@ -8865,7 +8865,7 @@ impl<SP: Deref> FundedChannel<SP> where
88658865
88668866 /// Only fails in case of signer rejection. Used for channel_reestablish commitment_signed
88678867 /// generation when we shouldn't change HTLC/channel state.
8868- fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<( msgs::CommitmentSigned, (Txid, Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)>)) , ChannelError> where L::Target: Logger {
8868+ fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<msgs::CommitmentSigned, ChannelError> where L::Target: Logger {
88698869 // Get the fee tests from `build_commitment_no_state_update`
88708870 #[cfg(any(test, fuzzing))]
88718871 self.build_commitment_no_state_update(logger);
@@ -8908,14 +8908,14 @@ impl<SP: Deref> FundedChannel<SP> where
89088908 }
89098909 }
89108910
8911- Ok(( msgs::CommitmentSigned {
8911+ Ok(msgs::CommitmentSigned {
89128912 channel_id: self.context.channel_id,
89138913 signature,
89148914 htlc_signatures,
89158915 batch: None,
89168916 #[cfg(taproot)]
89178917 partial_signature_with_nonce: None,
8918- }, (counterparty_commitment_txid, commitment_stats.htlcs_included)) )
8918+ })
89198919 },
89208920 // TODO (taproot|arik)
89218921 #[cfg(taproot)]
0 commit comments