Skip to content

Commit e309a6b

Browse files
committed
Use consistent initial commitment_signed naming
1 parent 51a4cc8 commit e309a6b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lightning/src/ln/channel.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@ where
18781878
#[cfg(splicing)]
18791879
pending_splice: None,
18801880
};
1881-
let res = funded_channel.commitment_signed_initial_v2(msg, best_block, signer_provider, logger)
1881+
let res = funded_channel.initial_commitment_signed_v2(msg, best_block, signer_provider, logger)
18821882
.map(|monitor| (Some(monitor), None))
18831883
// TODO: Change to `inspect_err` when MSRV is high enough.
18841884
.map_err(|err| {
@@ -5523,7 +5523,7 @@ where
55235523
self.assert_no_commitment_advancement(holder_commitment_transaction_number, "initial commitment_signed");
55245524
}
55255525

5526-
let commitment_signed = self.get_initial_commitment_signed(&funding, logger);
5526+
let commitment_signed = self.get_initial_commitment_signed_v2(&funding, logger);
55275527
let commitment_signed = match commitment_signed {
55285528
Some(commitment_signed) => commitment_signed,
55295529
// TODO(splicing): Support async signing
@@ -5616,7 +5616,7 @@ where
56165616
}
56175617

56185618
#[rustfmt::skip]
5619-
fn get_initial_commitment_signed<L: Deref>(
5619+
fn get_initial_commitment_signed_v2<L: Deref>(
56205620
&mut self, funding: &FundingScope, logger: &L
56215621
) -> Option<msgs::CommitmentSigned>
56225622
where
@@ -6930,7 +6930,7 @@ where
69306930
}
69316931

69326932
#[rustfmt::skip]
6933-
pub fn commitment_signed_initial_v2<L: Deref>(
6933+
pub fn initial_commitment_signed_v2<L: Deref>(
69346934
&mut self, msg: &msgs::CommitmentSigned, best_block: BestBlock, signer_provider: &SP, logger: &L
69356935
) -> Result<ChannelMonitor<<SP::Target as SignerProvider>::EcdsaSigner>, ChannelError>
69366936
where L::Target: Logger
@@ -8799,7 +8799,7 @@ where
87998799
// if it has not received tx_signatures for that funding transaction AND
88008800
// if next_commitment_number is zero:
88018801
// MUST retransmit its commitment_signed for that funding transaction.
8802-
let commitment_signed = self.context.get_initial_commitment_signed(&self.funding, logger)
8802+
let commitment_signed = self.context.get_initial_commitment_signed_v2(&self.funding, logger)
88038803
// TODO(splicing): Support async signing
88048804
.ok_or_else(|| {
88058805
let message = "Failed to get signatures for new commitment_signed".to_owned();

0 commit comments

Comments
 (0)