@@ -5996,6 +5996,7 @@ where
5996
5996
SP::Target: SignerProvider,
5997
5997
<SP::Target as SignerProvider>::EcdsaSigner: EcdsaChannelSigner,
5998
5998
{
5999
+ #[cfg(splicing)]
5999
6000
fn pending_funding(&self) -> &[FundingScope] {
6000
6001
if let Some(pending_splice) = &self.pending_splice {
6001
6002
pending_splice.pending_funding.as_slice()
@@ -6004,6 +6005,11 @@ where
6004
6005
}
6005
6006
}
6006
6007
6008
+ #[cfg(not(splicing))]
6009
+ fn pending_funding(&self) -> &[FundingScope] {
6010
+ &[]
6011
+ }
6012
+
6007
6013
#[rustfmt::skip]
6008
6014
fn check_remote_fee<F: Deref, L: Deref>(
6009
6015
channel_type: &ChannelTypeFeatures, fee_estimator: &LowerBoundedFeeEstimator<F>,
@@ -7483,6 +7489,7 @@ where
7483
7489
}
7484
7490
}
7485
7491
7492
+ #[cfg(splicing)]
7486
7493
for funding in core::iter::once(&mut self.funding).chain(
7487
7494
self.pending_splice
7488
7495
.as_mut()
@@ -7493,6 +7500,10 @@ where
7493
7500
funding.value_to_self_msat =
7494
7501
(funding.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
7495
7502
}
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
+ }
7496
7507
7497
7508
if let Some((feerate, update_state)) = self.context.pending_update_fee {
7498
7509
match update_state {
@@ -9908,12 +9919,17 @@ where
9908
9919
let unconfirmed_funding = (self.funding.get_funding_txid() == Some(*txid))
9909
9920
.then(|| &mut self.funding)
9910
9921
.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
+ }
9917
9933
});
9918
9934
9919
9935
if let Some(funding) = unconfirmed_funding {
0 commit comments