Skip to content

Commit c5d06a6

Browse files
committed
Revert "Add a counterparty_node_id to ClaimedHTLC in claimed events"
This reverts commit 3968d5e. Not sure how this slipped in but it breaks semver (a new field in a public struct) for a field that isn't used, so should be dropped.
1 parent 1e11baa commit c5d06a6

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

lightning/src/events/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,6 @@ impl_writeable_tlv_based_enum_legacy!(PaymentPurpose,
229229
/// Information about an HTLC that is part of a payment that can be claimed.
230230
#[derive(Clone, Debug, PartialEq, Eq)]
231231
pub struct ClaimedHTLC {
232-
/// The counterparty of the channel.
233-
///
234-
/// This value will always be `None` for objects serialized with LDK versions prior to 0.2 and
235-
/// `Some` otherwise.
236-
pub counterparty_node_id: Option<PublicKey>,
237232
/// The `channel_id` of the channel over which the HTLC was received.
238233
pub channel_id: ChannelId,
239234
/// The `user_channel_id` of the channel over which the HTLC was received. This is the value
@@ -264,7 +259,6 @@ impl_writeable_tlv_based!(ClaimedHTLC, {
264259
(0, channel_id, required),
265260
(1, counterparty_skimmed_fee_msat, (default_value, 0u64)),
266261
(2, user_channel_id, required),
267-
(3, counterparty_node_id, option),
268262
(4, cltv_expiry, required),
269263
(6, value_msat, required),
270264
});

lightning/src/ln/channelmanager.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,6 @@ struct ClaimableHTLC {
435435
impl From<&ClaimableHTLC> for events::ClaimedHTLC {
436436
fn from(val: &ClaimableHTLC) -> Self {
437437
events::ClaimedHTLC {
438-
counterparty_node_id: val.prev_hop.counterparty_node_id,
439438
channel_id: val.prev_hop.channel_id,
440439
user_channel_id: val.prev_hop.user_channel_id.unwrap_or(0),
441440
cltv_expiry: val.cltv_expiry,

0 commit comments

Comments
 (0)