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