Skip to content

Commit ba7d53e

Browse files
committed
f - fix CI
1 parent b26e282 commit ba7d53e

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

lightning/src/ln/channel.rs

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5996,6 +5996,7 @@ where
59965996
SP::Target: SignerProvider,
59975997
<SP::Target as SignerProvider>::EcdsaSigner: EcdsaChannelSigner,
59985998
{
5999+
#[cfg(splicing)]
59996000
fn pending_funding(&self) -> &[FundingScope] {
60006001
if let Some(pending_splice) = &self.pending_splice {
60016002
pending_splice.pending_funding.as_slice()
@@ -6004,6 +6005,11 @@ where
60046005
}
60056006
}
60066007

6008+
#[cfg(not(splicing))]
6009+
fn pending_funding(&self) -> &[FundingScope] {
6010+
&[]
6011+
}
6012+
60076013
#[rustfmt::skip]
60086014
fn check_remote_fee<F: Deref, L: Deref>(
60096015
channel_type: &ChannelTypeFeatures, fee_estimator: &LowerBoundedFeeEstimator<F>,
@@ -7483,6 +7489,7 @@ where
74837489
}
74847490
}
74857491

7492+
#[cfg(splicing)]
74867493
for funding in core::iter::once(&mut self.funding).chain(
74877494
self.pending_splice
74887495
.as_mut()
@@ -7493,6 +7500,10 @@ where
74937500
funding.value_to_self_msat =
74947501
(funding.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
74957502
}
7503+
#[cfg(not(splicing))] {
7504+
self.funding.value_to_self_msat =
7505+
(self.funding.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
7506+
}
74967507

74977508
if let Some((feerate, update_state)) = self.context.pending_update_fee {
74987509
match update_state {
@@ -9908,12 +9919,17 @@ where
99089919
let unconfirmed_funding = (self.funding.get_funding_txid() == Some(*txid))
99099920
.then(|| &mut self.funding)
99109921
.or_else(|| {
9911-
self.pending_splice.as_mut().and_then(|pending_splice| {
9912-
pending_splice
9913-
.pending_funding
9914-
.iter_mut()
9915-
.find(|funding| funding.get_funding_txid() == Some(*txid))
9916-
})
9922+
#[cfg(splicing)] {
9923+
self.pending_splice.as_mut().and_then(|pending_splice| {
9924+
pending_splice
9925+
.pending_funding
9926+
.iter_mut()
9927+
.find(|funding| funding.get_funding_txid() == Some(*txid))
9928+
})
9929+
}
9930+
#[cfg(not(splicing))] {
9931+
None
9932+
}
99179933
});
99189934

99199935
if let Some(funding) = unconfirmed_funding {

0 commit comments

Comments
 (0)