@@ -7002,7 +7002,7 @@ impl<SP: Deref> FundedChannel<SP> where
7002
7002
log_trace!(logger, "Regenerating latest commitment update in channel {} with{} {} update_adds, {} update_fulfills, {} update_fails, and {} update_fail_malformeds",
7003
7003
&self.context.channel_id(), if update_fee.is_some() { " update_fee," } else { "" },
7004
7004
update_add_htlcs.len(), update_fulfill_htlcs.len(), update_fail_htlcs.len(), update_fail_malformed_htlcs.len());
7005
- let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger).map(|(cu, _)| cu) {
7005
+ let commitment_signed = if let Ok(update) = self.send_commitment_no_state_update(logger) {
7006
7006
if self.context.signer_pending_commitment_update {
7007
7007
log_trace!(logger, "Commitment update generated: clearing signer_pending_commitment_update");
7008
7008
self.context.signer_pending_commitment_update = false;
@@ -8917,7 +8917,7 @@ impl<SP: Deref> FundedChannel<SP> where
8917
8917
8918
8918
/// Only fails in case of signer rejection. Used for channel_reestablish commitment_signed
8919
8919
/// generation when we shouldn't change HTLC/channel state.
8920
- fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<( msgs::CommitmentSigned, (Txid, Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)>)) , ChannelError> where L::Target: Logger {
8920
+ fn send_commitment_no_state_update<L: Deref>(&self, logger: &L) -> Result<msgs::CommitmentSigned, ChannelError> where L::Target: Logger {
8921
8921
// Get the fee tests from `build_commitment_no_state_update`
8922
8922
#[cfg(any(test, fuzzing))]
8923
8923
self.build_commitment_no_state_update(logger);
@@ -8960,14 +8960,14 @@ impl<SP: Deref> FundedChannel<SP> where
8960
8960
}
8961
8961
}
8962
8962
8963
- Ok(( msgs::CommitmentSigned {
8963
+ Ok(msgs::CommitmentSigned {
8964
8964
channel_id: self.context.channel_id,
8965
8965
signature,
8966
8966
htlc_signatures,
8967
8967
batch: None,
8968
8968
#[cfg(taproot)]
8969
8969
partial_signature_with_nonce: None,
8970
- }, (counterparty_commitment_txid, commitment_stats.htlcs_included)) )
8970
+ })
8971
8971
},
8972
8972
// TODO (taproot|arik)
8973
8973
#[cfg(taproot)]
0 commit comments