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