@@ -4882,13 +4882,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
48824882 }
48834883
48844884 #[cfg(splicing)]
4885- fn check_get_splice_locked<L: Deref> (
4885+ fn check_get_splice_locked(
48864886 &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> {
48924888 if !self.check_funding_confirmations(funding, height) {
48934889 return None;
48944890 }
@@ -4949,13 +4945,10 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
49494945 return true;
49504946 }
49514947
4952- fn check_for_funding_tx_confirmed<L: Deref> (
4948+ fn check_for_funding_tx_confirmed(
49534949 &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> {
49594952 let funding_txo = match funding.get_funding_txo() {
49604953 Some(funding_txo) => funding_txo,
49614954 None => {
@@ -8376,7 +8369,7 @@ impl<SP: Deref> FundedChannel<SP> where
83768369 // and send it immediately instead of waiting for a best_block_updated call (which may have
83778370 // already happened for this block).
83788371 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,
83808373 )?;
83818374
83828375 if is_funding_tx_confirmed {
@@ -8396,7 +8389,7 @@ impl<SP: Deref> FundedChannel<SP> where
83968389 #[cfg(splicing)]
83978390 for funding in self.pending_funding.iter_mut() {
83988391 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,
84008393 )? {
84018394 if confirmed_funding.is_some() {
84028395 let err_reason = "splice tx of another pending funding already confirmed";
@@ -8423,7 +8416,7 @@ impl<SP: Deref> FundedChannel<SP> where
84238416 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
84248417 }
84258418
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) {
84278420 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
84288421
84298422 pending_splice.sent_funding_txid = Some(splice_locked.splice_txid);
@@ -8559,7 +8552,7 @@ impl<SP: Deref> FundedChannel<SP> where
85598552 },
85608553 };
85618554
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) {
85638556 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
85648557
85658558 pending_splice.sent_funding_txid = Some(splice_locked.splice_txid);
0 commit comments