@@ -6889,7 +6889,7 @@ impl<SP: Deref> FundedChannel<SP> where
6889
6889
log_trace!(logger, "Regenerating latest commitment update in channel {} with{} {} update_adds, {} update_fulfills, {} update_fails, and {} update_fail_malformeds",
6890
6890
&self.context.channel_id(), if update_fee.is_some() { " update_fee," } else { "" },
6891
6891
update_add_htlcs.len(), update_fulfill_htlcs.len(), update_fail_htlcs.len(), update_fail_malformed_htlcs.len());
6892
- let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger).map(|(cu, _)| cu) {
6892
+ let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger) {
6893
6893
if self.context.signer_pending_commitment_update {
6894
6894
log_trace!(logger, "Commitment update generated: clearing signer_pending_commitment_update");
6895
6895
self.context.signer_pending_commitment_update = false;
@@ -8669,7 +8669,7 @@ impl<SP: Deref> FundedChannel<SP> where
8669
8669
8670
8670
/// Only fails in case of signer rejection. Used for channel_reestablish commitment_signed
8671
8671
/// generation when we shouldn't change HTLC/channel state.
8672
- fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<( msgs::CommitmentSigned, (Txid, Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)>)) , ChannelError> where L::Target: Logger {
8672
+ fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<msgs::CommitmentSigned, ChannelError> where L::Target: Logger {
8673
8673
// Get the fee tests from `build_commitment_no_state_update`
8674
8674
#[cfg(any(test, fuzzing))]
8675
8675
self.build_commitment_no_state_update(logger);
@@ -8712,14 +8712,14 @@ impl<SP: Deref> FundedChannel<SP> where
8712
8712
}
8713
8713
}
8714
8714
8715
- Ok(( msgs::CommitmentSigned {
8715
+ Ok(msgs::CommitmentSigned {
8716
8716
channel_id: self.context.channel_id,
8717
8717
signature,
8718
8718
htlc_signatures,
8719
8719
batch: None,
8720
8720
#[cfg(taproot)]
8721
8721
partial_signature_with_nonce: None,
8722
- }, (counterparty_commitment_txid, commitment_stats.htlcs_included)) )
8722
+ })
8723
8723
},
8724
8724
// TODO (taproot|arik)
8725
8725
#[cfg(taproot)]
0 commit comments