@@ -6950,7 +6950,7 @@ impl<SP: Deref> FundedChannel<SP> where
6950
6950
log_trace!(logger, "Regenerating latest commitment update in channel {} with{} {} update_adds, {} update_fulfills, {} update_fails, and {} update_fail_malformeds",
6951
6951
&self.context.channel_id(), if update_fee.is_some() { " update_fee," } else { "" },
6952
6952
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) {
6954
6954
if self.context.signer_pending_commitment_update {
6955
6955
log_trace!(logger, "Commitment update generated: clearing signer_pending_commitment_update");
6956
6956
self.context.signer_pending_commitment_update = false;
@@ -8865,7 +8865,7 @@ impl<SP: Deref> FundedChannel<SP> where
8865
8865
8866
8866
/// Only fails in case of signer rejection. Used for channel_reestablish commitment_signed
8867
8867
/// 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 {
8869
8869
// Get the fee tests from `build_commitment_no_state_update`
8870
8870
#[cfg(any(test, fuzzing))]
8871
8871
self.build_commitment_no_state_update(logger);
@@ -8908,14 +8908,14 @@ impl<SP: Deref> FundedChannel<SP> where
8908
8908
}
8909
8909
}
8910
8910
8911
- Ok(( msgs::CommitmentSigned {
8911
+ Ok(msgs::CommitmentSigned {
8912
8912
channel_id: self.context.channel_id,
8913
8913
signature,
8914
8914
htlc_signatures,
8915
8915
batch: None,
8916
8916
#[cfg(taproot)]
8917
8917
partial_signature_with_nonce: None,
8918
- }, (counterparty_commitment_txid, commitment_stats.htlcs_included)) )
8918
+ })
8919
8919
},
8920
8920
// TODO (taproot|arik)
8921
8921
#[cfg(taproot)]
0 commit comments