Skip to content

Commit 4f791fc

Browse files
committed
Add ChannelId pending change note; formatting
1 parent 61d896d commit 4f791fc

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

lightning/src/ln/channel_id.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ use core::fmt;
2121
use core::ops::Deref;
2222

2323
/// A unique 32-byte identifier for a channel.
24-
/// Depending on how the ID is generated, several varieties are distinguished (but all are stored as 32 bytes): _v1_ and _temporary_.
24+
/// Depending on how the ID is generated, several varieties are distinguished (but all are stored as 32 bytes):
25+
/// _v1_ and _temporary_.
2526
/// A _v1_ channel ID is generated based on funding tx outpoint (txid & index).
2627
/// A _temporary_ ID is generated randomly.
2728
/// (Later revocation-point-based _v2_ is a possibility.)

lightning/src/ln/payment_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER, LATE
1616
use crate::sign::EntropySource;
1717
use crate::chain::transaction::OutPoint;
1818
use crate::events::{ClosureReason, Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason, PaymentPurpose};
19-
use crate::ln::channel::{EXPIRE_PREV_CONFIG_TICKS};
19+
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
2020
use crate::ln::channelmanager::{BREAKDOWN_TIMEOUT, MPP_TIMEOUT_TICKS, MIN_CLTV_EXPIRY_DELTA, PaymentId, PaymentSendFailure, IDEMPOTENCY_TIMEOUT_TICKS, RecentPaymentDetails, RecipientOnionFields, HTLCForwardInfo, PendingHTLCRouting, PendingAddHTLCInfo};
2121
use crate::ln::features::Bolt11InvoiceFeatures;
2222
use crate::ln::{msgs, ChannelId, PaymentSecret, PaymentPreimage};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* In several APIs, `channel_id` parameters have to be changed from type `[u8; 32]` to newly introduced `ChannelId` type, from `ln` namespace (`lightning::ln::ChannelId`) (PR #2485)

0 commit comments

Comments
 (0)