Skip to content

Commit c51b6ff

Browse files
committed
Use consistent initial commitment_signed naming
1 parent 29081e7 commit c51b6ff

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| {
@@ -5524,7 +5524,7 @@ where
55245524
self.assert_no_commitment_advancement(holder_commitment_transaction_number, "initial commitment_signed");
55255525
}
55265526

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

56175617
#[rustfmt::skip]
5618-
fn get_initial_commitment_signed<L: Deref>(
5618+
fn get_initial_commitment_signed_v2<L: Deref>(
56195619
&mut self, funding: &FundingScope, logger: &L
56205620
) -> Option<msgs::CommitmentSigned>
56215621
where
@@ -6929,7 +6929,7 @@ where
69296929
}
69306930

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

0 commit comments

Comments
 (0)