Skip to content

Commit a65b118

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 0c38dff commit a65b118

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
@@ -743,9 +743,8 @@ where
743743
/// very far in the past, and can only ever be up to two hours in the future.
744744
highest_seen_timestamp: AtomicUsize,
745745

746-
/// The bulk of our storage will eventually be here (message queues and the like). Currently
747-
/// the `per_peer_state` stores our channels on a per-peer basis, as well as the peer's latest
748-
/// features.
746+
/// The bulk of our storage. Currently the `per_peer_state` stores our channels on a per-peer
747+
/// basis, as well as the peer's latest features.
749748
///
750749
/// If we are connected to a peer we always at least have an entry here, even if no channels
751750
/// are currently open with that peer.
@@ -1196,7 +1195,7 @@ macro_rules! handle_error {
11961195
#[cfg(debug_assertions)]
11971196
{
11981197
if per_peer_state.get(&$counterparty_node_id).is_none() {
1199-
// This shouldn't occour in tests unless an unkown counterparty_node_id
1198+
// This shouldn't occur in tests unless an unknown counterparty_node_id
12001199
// has been passed to our message handling functions.
12011200
let expected_error_str = format!("Can't find a peer matching the passed counterparty node_id {}", $counterparty_node_id);
12021201
match err.action {
@@ -2229,7 +2228,8 @@ where
22292228
/// public, and thus should be called whenever the result is going to be passed out in a
22302229
/// [`MessageSendEvent::BroadcastChannelUpdate`] event.
22312230
///
2232-
/// May be called with peer_state already locked!
2231+
/// Note that this function may be called without the `peer_state` corresponding to the passed
2232+
/// channel's counterparty acquired, when the call site has full ownership of the channel.
22332233
fn get_channel_update_for_broadcast(&self, chan: &Channel<<SP::Target as SignerProvider>::Signer>) -> Result<msgs::ChannelUpdate, LightningError> {
22342234
if !chan.should_announce() {
22352235
return Err(LightningError {
@@ -2248,7 +2248,8 @@ where
22482248
/// is public (only returning an Err if the channel does not yet have an assigned short_id),
22492249
/// and thus MUST NOT be called unless the recipient of the resulting message has already
22502250
/// provided evidence that they know about the existence of the channel.
2251-
/// May be called with peer_state already locked!
2251+
/// Note that this function may be called without the `peer_state` corresponding to the passed
2252+
/// channel's counterparty acquired, when the call site has full ownership of the channel.
22522253
fn get_channel_update_for_unicast(&self, chan: &Channel<<SP::Target as SignerProvider>::Signer>) -> Result<msgs::ChannelUpdate, LightningError> {
22532254
log_trace!(self.logger, "Attempting to generate channel update for channel {}", log_bytes!(chan.channel_id()));
22542255
let short_channel_id = match chan.get_short_channel_id().or(chan.latest_inbound_scid_alias()) {
@@ -3553,7 +3554,7 @@ where
35533554
fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
35543555
#[cfg(debug_assertions)]
35553556
{
3556-
// Ensure that no peer state channel storage lock is not held when calling this
3557+
// Ensure that the peer state channel storage lock is not held when calling this
35573558
// function.
35583559
// This ensures that future code doesn't introduce a lock_order requirement for
35593560
// `forward_htlcs` to be locked after the `per_peer_state` peer locks, which calling
@@ -5452,7 +5453,8 @@ where
54525453
/// Note that that while `MessageSendEvent`s are strictly ordered per-peer, the peer order for
54535454
/// the chunks of `MessageSendEvent`s for different peers is random. I.e. if the array contains
54545455
/// `MessageSendEvent`s for both `node_a` and `node_b`, the `MessageSendEvent`s for `node_a`
5455-
/// will randomly be placed first or last in the returned array.
5456+
/// will randomly be placed first or last in the returned array. Note that order will not be
5457+
/// randomized with the `no-std` feature enabled.
54565458
///
54575459
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
54585460
/// `MessageSendEvent`s are intended to be broadcasted to all peers, they will be pleaced among

0 commit comments

Comments
 (0)