Skip to content

Commit f9e4f7c

Browse files
Remove legacy ChannelManagerData::pending_claiming_payments
Cleanup from previous commit
1 parent 1cb6e76 commit f9e4f7c

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17842,7 +17842,6 @@ pub(super) struct ChannelManagerData<SP: SignerProvider> {
1784217842
pending_events_read: VecDeque<(events::Event, Option<EventCompletionAction>)>,
1784317843
highest_seen_timestamp: u32,
1784417844
pending_outbound_payments: HashMap<PaymentId, PendingOutboundPayment>,
17845-
pending_claiming_payments_legacy: HashMap<PaymentHash, ClaimingPayment>,
1784617845
received_network_pubkey: Option<PublicKey>,
1784717846
monitor_update_blocked_actions_per_peer:
1784817847
Vec<(PublicKey, BTreeMap<ChannelId, Vec<MonitorUpdateCompletionAction>>)>,
@@ -18028,7 +18027,9 @@ impl<'a, ES: EntropySource, SP: SignerProvider, L: Logger>
1802818027
let mut amountless_claimable_htlc_onion_fields_legacy: Option<
1802918028
Vec<Option<AmountlessClaimablePaymentHTLCOnion>>,
1803018029
> = None;
18031-
let mut pending_claiming_payments_legacy = Some(new_hash_map());
18030+
// As of 0.4 we reconstruct this map using `ChannelMonitor` data on read.
18031+
let mut _pending_claiming_payments_legacy: Option<HashMap<PaymentHash, ClaimingPayment>> =
18032+
None;
1803218033
let mut monitor_update_blocked_actions_per_peer: Option<Vec<(_, BTreeMap<_, Vec<_>>)>> =
1803318034
None;
1803418035
let mut events_override = None;
@@ -18047,7 +18048,7 @@ impl<'a, ES: EntropySource, SP: SignerProvider, L: Logger>
1804718048
(1, pending_outbound_payments_no_retry, option),
1804818049
(2, pending_intercepted_htlcs_legacy, option),
1804918050
(3, pending_outbound_payments, option),
18050-
(4, pending_claiming_payments_legacy, option),
18051+
(4, _pending_claiming_payments_legacy, option),
1805118052
(5, received_network_pubkey, option),
1805218053
(6, monitor_update_blocked_actions_per_peer, option),
1805318054
(7, fake_scid_rand_bytes, option),
@@ -18168,8 +18169,6 @@ impl<'a, ES: EntropySource, SP: SignerProvider, L: Logger>
1816818169
pending_intercepted_htlcs_legacy: pending_intercepted_htlcs_legacy
1816918170
.unwrap_or_else(new_hash_map),
1817018171
pending_outbound_payments,
18171-
pending_claiming_payments_legacy: pending_claiming_payments_legacy
18172-
.unwrap_or_else(new_hash_map),
1817318172
received_network_pubkey,
1817418173
monitor_update_blocked_actions_per_peer: monitor_update_blocked_actions_per_peer
1817518174
.unwrap_or_else(Vec::new),
@@ -18473,7 +18472,6 @@ impl<
1847318472
highest_seen_timestamp,
1847418473
mut pending_intercepted_htlcs_legacy,
1847518474
pending_outbound_payments,
18476-
pending_claiming_payments_legacy,
1847718475
received_network_pubkey,
1847818476
monitor_update_blocked_actions_per_peer,
1847918477
mut fake_scid_rand_bytes,

0 commit comments

Comments
 (0)