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