@@ -4882,13 +4882,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
4882
4882
}
4883
4883
4884
4884
#[cfg(splicing)]
4885
- fn check_get_splice_locked<L: Deref> (
4885
+ fn check_get_splice_locked(
4886
4886
&mut self, pending_splice: &PendingSplice, funding: &mut FundingScope, height: u32,
4887
- logger: &L,
4888
- ) -> Option<msgs::SpliceLocked>
4889
- where
4890
- L::Target: Logger,
4891
- {
4887
+ ) -> Option<msgs::SpliceLocked> {
4892
4888
if !self.check_funding_confirmations(funding, height) {
4893
4889
return None;
4894
4890
}
@@ -4949,13 +4945,10 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
4949
4945
return true;
4950
4946
}
4951
4947
4952
- fn check_for_funding_tx_confirmed<L: Deref> (
4948
+ fn check_for_funding_tx_confirmed(
4953
4949
&mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
4954
- index_in_block: usize, tx: &mut ConfirmedTransaction, logger: &L,
4955
- ) -> Result<bool, ClosureReason>
4956
- where
4957
- L::Target: Logger
4958
- {
4950
+ index_in_block: usize, tx: &mut ConfirmedTransaction,
4951
+ ) -> Result<bool, ClosureReason> {
4959
4952
let funding_txo = match funding.get_funding_txo() {
4960
4953
Some(funding_txo) => funding_txo,
4961
4954
None => {
@@ -8376,7 +8369,7 @@ impl<SP: Deref> FundedChannel<SP> where
8376
8369
// and send it immediately instead of waiting for a best_block_updated call (which may have
8377
8370
// already happened for this block).
8378
8371
let is_funding_tx_confirmed = self.context.check_for_funding_tx_confirmed(
8379
- &mut self.funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
8372
+ &mut self.funding, block_hash, height, index_in_block, &mut confirmed_tx,
8380
8373
)?;
8381
8374
8382
8375
if is_funding_tx_confirmed {
@@ -8396,7 +8389,7 @@ impl<SP: Deref> FundedChannel<SP> where
8396
8389
#[cfg(splicing)]
8397
8390
for funding in self.pending_funding.iter_mut() {
8398
8391
if self.context.check_for_funding_tx_confirmed(
8399
- funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
8392
+ funding, block_hash, height, index_in_block, &mut confirmed_tx,
8400
8393
)? {
8401
8394
if confirmed_funding.is_some() {
8402
8395
let err_reason = "splice tx of another pending funding already confirmed";
@@ -8423,7 +8416,7 @@ impl<SP: Deref> FundedChannel<SP> where
8423
8416
self.context.check_for_funding_tx_spent(funding, tx, logger)?;
8424
8417
}
8425
8418
8426
- if let Some(splice_locked) = self.context.check_get_splice_locked(pending_splice, funding, height, logger ) {
8419
+ if let Some(splice_locked) = self.context.check_get_splice_locked(pending_splice, funding, height) {
8427
8420
log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
8428
8421
8429
8422
pending_splice.sent_funding_txid = Some(splice_locked.splice_txid);
@@ -8559,7 +8552,7 @@ impl<SP: Deref> FundedChannel<SP> where
8559
8552
},
8560
8553
};
8561
8554
8562
- if let Some(splice_locked) = self.context.check_get_splice_locked(pending_splice, funding, height, logger ) {
8555
+ if let Some(splice_locked) = self.context.check_get_splice_locked(pending_splice, funding, height) {
8563
8556
log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
8564
8557
8565
8558
pending_splice.sent_funding_txid = Some(splice_locked.splice_txid);
0 commit comments