Skip to content

Commit 747a8e6

Browse files
Update ChannelManager docs
Updates multipe instances of the `ChannelManager` docs related to the previous change that moved the storage of the channels to the `per_peer_state`. This docs update corrects some grammar errors and incorrect information, as well as clarifies documentation that was confusing.
1 parent ce8b8ee commit 747a8e6

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -767,9 +767,8 @@ where
767767
/// very far in the past, and can only ever be up to two hours in the future.
768768
highest_seen_timestamp: AtomicUsize,
769769

770-
/// The bulk of our storage will eventually be here (message queues and the like). Currently
771-
/// the `per_peer_state` stores our channels on a per-peer basis, as well as the peer's latest
772-
/// features.
770+
/// The bulk of our storage. Currently the `per_peer_state` stores our channels on a per-peer
771+
/// basis, as well as the peer's latest features.
773772
///
774773
/// If we are connected to a peer we always at least have an entry here, even if no channels
775774
/// are currently open with that peer.
@@ -1250,7 +1249,7 @@ macro_rules! handle_error {
12501249
#[cfg(any(feature = "_test_utils", test))]
12511250
{
12521251
if per_peer_state.get(&$counterparty_node_id).is_none() {
1253-
// This shouldn't occour in tests unless an unkown counterparty_node_id
1252+
// This shouldn't occur in tests unless an unknown counterparty_node_id
12541253
// has been passed to our message handling functions.
12551254
let expected_error_str = format!("Can't find a peer matching the passed counterparty node_id {}", $counterparty_node_id);
12561255
match err.action {
@@ -2313,7 +2312,8 @@ where
23132312
/// public, and thus should be called whenever the result is going to be passed out in a
23142313
/// [`MessageSendEvent::BroadcastChannelUpdate`] event.
23152314
///
2316-
/// May be called with peer_state already locked!
2315+
/// Note that this function may be called without the `peer_state` corresponding to the passed
2316+
/// channel's counterparty acquired, when the call site has full ownership of the channel.
23172317
fn get_channel_update_for_broadcast(&self, chan: &Channel<<SP::Target as SignerProvider>::Signer>) -> Result<msgs::ChannelUpdate, LightningError> {
23182318
if !chan.should_announce() {
23192319
return Err(LightningError {
@@ -2332,7 +2332,8 @@ where
23322332
/// is public (only returning an Err if the channel does not yet have an assigned short_id),
23332333
/// and thus MUST NOT be called unless the recipient of the resulting message has already
23342334
/// provided evidence that they know about the existence of the channel.
2335-
/// May be called with peer_state already locked!
2335+
/// Note that this function may be called without the `peer_state` corresponding to the passed
2336+
/// channel's counterparty acquired, when the call site has full ownership of the channel.
23362337
fn get_channel_update_for_unicast(&self, chan: &Channel<<SP::Target as SignerProvider>::Signer>) -> Result<msgs::ChannelUpdate, LightningError> {
23372338
log_trace!(self.logger, "Attempting to generate channel update for channel {}", log_bytes!(chan.channel_id()));
23382339
let short_channel_id = match chan.get_short_channel_id().or(chan.latest_inbound_scid_alias()) {
@@ -3712,7 +3713,7 @@ where
37123713
fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
37133714
#[cfg(any(feature = "_test_utils", test))]
37143715
{
3715-
// Ensure that no peer state channel storage lock is not held when calling this
3716+
// Ensure that the peer state channel storage lock is not held when calling this
37163717
// function.
37173718
// This ensures that future code doesn't introduce a lock_order requirement for
37183719
// `forward_htlcs` to be locked after the `per_peer_state` peer locks, which calling
@@ -5629,7 +5630,8 @@ where
56295630
/// Note that that while `MessageSendEvent`s are strictly ordered per-peer, the peer order for
56305631
/// the chunks of `MessageSendEvent`s for different peers is random. I.e. if the array contains
56315632
/// `MessageSendEvent`s for both `node_a` and `node_b`, the `MessageSendEvent`s for `node_a`
5632-
/// will randomly be placed first or last in the returned array.
5633+
/// will randomly be placed first or last in the returned array. Note that order will not be
5634+
/// randomized with the `no-std` feature enabled.
56335635
///
56345636
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
56355637
/// `MessageSendEvent`s are intended to be broadcasted to all peers, they will be pleaced among

0 commit comments

Comments
 (0)