@@ -6913,7 +6913,7 @@ impl<SP: Deref> FundedChannel<SP> where
6913
6913
log_trace!(logger, "Regenerating latest commitment update in channel {} with{} {} update_adds, {} update_fulfills, {} update_fails, and {} update_fail_malformeds",
6914
6914
&self.context.channel_id(), if update_fee.is_some() { " update_fee," } else { "" },
6915
6915
update_add_htlcs.len(), update_fulfill_htlcs.len(), update_fail_htlcs.len(), update_fail_malformed_htlcs.len());
6916
- let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger).map(|(cu, _)| cu) {
6916
+ let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger) {
6917
6917
if self.context.signer_pending_commitment_update {
6918
6918
log_trace!(logger, "Commitment update generated: clearing signer_pending_commitment_update");
6919
6919
self.context.signer_pending_commitment_update = false;
@@ -8702,7 +8702,7 @@ impl<SP: Deref> FundedChannel<SP> where
8702
8702
8703
8703
/// Only fails in case of signer rejection. Used for channel_reestablish commitment_signed
8704
8704
/// generation when we shouldn't change HTLC/channel state.
8705
- fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<( msgs::CommitmentSigned, (Txid, Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)>)) , ChannelError> where L::Target: Logger {
8705
+ fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<msgs::CommitmentSigned, ChannelError> where L::Target: Logger {
8706
8706
// Get the fee tests from `build_commitment_no_state_update`
8707
8707
#[cfg(any(test, fuzzing))]
8708
8708
self.build_commitment_no_state_update(logger);
@@ -8745,14 +8745,14 @@ impl<SP: Deref> FundedChannel<SP> where
8745
8745
}
8746
8746
}
8747
8747
8748
- Ok(( msgs::CommitmentSigned {
8748
+ Ok(msgs::CommitmentSigned {
8749
8749
channel_id: self.context.channel_id,
8750
8750
signature,
8751
8751
htlc_signatures,
8752
8752
batch: None,
8753
8753
#[cfg(taproot)]
8754
8754
partial_signature_with_nonce: None,
8755
- }, (counterparty_commitment_txid, commitment_stats.htlcs_included)) )
8755
+ })
8756
8756
},
8757
8757
// TODO (taproot|arik)
8758
8758
#[cfg(taproot)]
0 commit comments