From 823497d5a317b0b83d747feecf00ec1041fb9950 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 2 Dec 2018 14:26:07 -0500 Subject: [PATCH] Unify the update pattern in provide_latest_local_commitment_tx_info --- src/ln/channelmonitor.rs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs index 65b592a87..7faeae68a 100644 --- a/src/ln/channelmonitor.rs +++ b/src/ln/channelmonitor.rs @@ -520,18 +520,12 @@ impl ChannelMonitor { feerate_per_kw, htlc_outputs, }); - self.key_storage = if let Storage::Local { ref revocation_base_key, ref htlc_base_key, ref delayed_payment_base_key, ref payment_base_key, ref shutdown_pubkey, ref latest_per_commitment_point, ref mut funding_info, .. } = self.key_storage { - Storage::Local { - revocation_base_key: *revocation_base_key, - htlc_base_key: *htlc_base_key, - delayed_payment_base_key: *delayed_payment_base_key, - payment_base_key: *payment_base_key, - shutdown_pubkey: *shutdown_pubkey, - prev_latest_per_commitment_point: *latest_per_commitment_point, - latest_per_commitment_point: Some(local_keys.per_commitment_point), - funding_info: funding_info.take(), - } - } else { unimplemented!(); }; + + if let Storage::Local { ref mut latest_per_commitment_point, .. } = self.key_storage { + *latest_per_commitment_point = Some(local_keys.per_commitment_point); + } else { + panic!("Channel somehow ended up with its internal ChannelMonitor being in Watchtower mode?"); + } } /// Provides a payment_hash->payment_preimage mapping. Will be automatically pruned when all -- 2.39.5