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