From 524c532d40ab82e5a05f0fa2df4519fbacfe3ddc Mon Sep 17 00:00:00 2001 From: Jeffrey Czyz Date: Mon, 12 Apr 2021 11:47:23 -0700 Subject: [PATCH] Rename onchain_events_waiting_threshold_conf --- lightning/src/chain/channelmonitor.rs | 52 +++++++++++++-------------- lightning/src/ln/onchaintx.rs | 42 +++++++++++----------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs index ed206dcfe..777bc06bf 100644 --- a/lightning/src/chain/channelmonitor.rs +++ b/lightning/src/chain/channelmonitor.rs @@ -708,7 +708,7 @@ pub(crate) struct ChannelMonitorImpl { // Used to track on-chain events (i.e., transactions part of channels confirmed on chain) on // which to take actions once they reach enough confirmations. Each entry includes the // transaction's id and the height when the transaction was confirmed on chain. - onchain_events_waiting_threshold_conf: Vec, + onchain_events_awaiting_threshold_conf: Vec, // If we get serialized out and re-read, we need to make sure that the chain monitoring // interface knows about the TXOs that we want to be notified of spends of. We could probably @@ -790,7 +790,7 @@ impl PartialEq for ChannelMonitorImpl { self.payment_preimages != other.payment_preimages || self.pending_monitor_events != other.pending_monitor_events || self.pending_events.len() != other.pending_events.len() || // We trust events to round-trip properly - self.onchain_events_waiting_threshold_conf != other.onchain_events_waiting_threshold_conf || + self.onchain_events_awaiting_threshold_conf != other.onchain_events_awaiting_threshold_conf || self.outputs_to_watch != other.outputs_to_watch || self.lockdown_from_offchain != other.lockdown_from_offchain || self.holder_tx_signed != other.holder_tx_signed @@ -959,8 +959,8 @@ impl Writeable for ChannelMonitorImpl { self.best_block.block_hash().write(writer)?; writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?; - writer.write_all(&byte_utils::be64_to_array(self.onchain_events_waiting_threshold_conf.len() as u64))?; - for ref entry in self.onchain_events_waiting_threshold_conf.iter() { + writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?; + for ref entry in self.onchain_events_awaiting_threshold_conf.iter() { entry.txid.write(writer)?; writer.write_all(&byte_utils::be32_to_array(entry.height))?; match entry.event { @@ -1080,7 +1080,7 @@ impl ChannelMonitor { pending_monitor_events: Vec::new(), pending_events: Vec::new(), - onchain_events_waiting_threshold_conf: Vec::new(), + onchain_events_awaiting_threshold_conf: Vec::new(), outputs_to_watch, onchain_tx_handler, @@ -1392,7 +1392,7 @@ impl ChannelMonitor { /// Returns the set of txids that should be monitored for re-organization out of the chain. pub fn get_relevant_txids(&self) -> Vec { let inner = self.inner.lock().unwrap(); - let mut txids: Vec = inner.onchain_events_waiting_threshold_conf + let mut txids: Vec = inner.onchain_events_awaiting_threshold_conf .iter() .map(|entry| entry.txid) .chain(inner.onchain_tx_handler.get_relevant_txids().into_iter()) @@ -1759,7 +1759,7 @@ impl ChannelMonitorImpl { if let Some(ref outpoints) = self.counterparty_claimable_outpoints.get($txid) { for &(ref htlc, ref source_option) in outpoints.iter() { if let &Some(ref source) = source_option { - self.onchain_events_waiting_threshold_conf.retain(|ref entry| { + self.onchain_events_awaiting_threshold_conf.retain(|ref entry| { if entry.height != height { return true; } match entry.event { OnchainEvent::HTLCUpdate { ref htlc_update } => { @@ -1776,7 +1776,7 @@ impl ChannelMonitorImpl { }, }; log_info!(logger, "Failing HTLC with payment_hash {} from {} counterparty commitment tx due to broadcast of revoked counterparty commitment transaction, waiting for confirmation (at height {})", log_bytes!(htlc.payment_hash.0), $commitment_tx, entry.confirmation_threshold()); - self.onchain_events_waiting_threshold_conf.push(entry); + self.onchain_events_awaiting_threshold_conf.push(entry); } } } @@ -1825,7 +1825,7 @@ impl ChannelMonitorImpl { } } log_trace!(logger, "Failing HTLC with payment_hash {} from {} counterparty commitment tx due to broadcast of counterparty commitment transaction", log_bytes!(htlc.payment_hash.0), $commitment_tx); - self.onchain_events_waiting_threshold_conf.retain(|ref entry| { + self.onchain_events_awaiting_threshold_conf.retain(|ref entry| { if entry.height != height { return true; } match entry.event { OnchainEvent::HTLCUpdate { ref htlc_update } => { @@ -1834,7 +1834,7 @@ impl ChannelMonitorImpl { _ => true, } }); - self.onchain_events_waiting_threshold_conf.push(OnchainEventEntry { + self.onchain_events_awaiting_threshold_conf.push(OnchainEventEntry { txid: *$txid, height, event: OnchainEvent::HTLCUpdate { @@ -1981,7 +1981,7 @@ impl ChannelMonitorImpl { macro_rules! wait_threshold_conf { ($source: expr, $commitment_tx: expr, $payment_hash: expr) => { - self.onchain_events_waiting_threshold_conf.retain(|ref entry| { + self.onchain_events_awaiting_threshold_conf.retain(|ref entry| { if entry.height != height { return true; } match entry.event { OnchainEvent::HTLCUpdate { ref htlc_update } => { @@ -1996,7 +1996,7 @@ impl ChannelMonitorImpl { event: OnchainEvent::HTLCUpdate { htlc_update: ($source, $payment_hash) }, }; log_trace!(logger, "Failing HTLC with payment_hash {} from {} holder commitment tx due to broadcast of transaction, waiting confirmation (at height{})", log_bytes!($payment_hash.0), $commitment_tx, entry.confirmation_threshold()); - self.onchain_events_waiting_threshold_conf.push(entry); + self.onchain_events_awaiting_threshold_conf.push(entry); } } @@ -2130,7 +2130,7 @@ impl ChannelMonitorImpl { self.block_confirmed(height, vec![], vec![], vec![], broadcaster, fee_estimator, logger) } else { self.best_block = BestBlock::new(block_hash, height); - self.onchain_events_waiting_threshold_conf.retain(|ref entry| entry.height <= height); + self.onchain_events_awaiting_threshold_conf.retain(|ref entry| entry.height <= height); self.onchain_tx_handler.block_disconnected(height + 1, broadcaster, fee_estimator, logger); Vec::new() } @@ -2238,20 +2238,20 @@ impl ChannelMonitorImpl { } // Find which on-chain events have reached their confirmation threshold. - let onchain_events_waiting_threshold_conf = - self.onchain_events_waiting_threshold_conf.drain(..).collect::>(); + let onchain_events_awaiting_threshold_conf = + self.onchain_events_awaiting_threshold_conf.drain(..).collect::>(); let mut onchain_events_reaching_threshold_conf = Vec::new(); - for entry in onchain_events_waiting_threshold_conf { + for entry in onchain_events_awaiting_threshold_conf { if entry.has_reached_confirmation_threshold(height) { onchain_events_reaching_threshold_conf.push(entry); } else { - self.onchain_events_waiting_threshold_conf.push(entry); + self.onchain_events_awaiting_threshold_conf.push(entry); } } // Used to check for duplicate HTLC resolutions. #[cfg(debug_assertions)] - let unmatured_htlcs: Vec<_> = self.onchain_events_waiting_threshold_conf + let unmatured_htlcs: Vec<_> = self.onchain_events_awaiting_threshold_conf .iter() .filter_map(|entry| match &entry.event { OnchainEvent::HTLCUpdate { htlc_update } => Some(htlc_update.0.clone()), @@ -2332,7 +2332,7 @@ impl ChannelMonitorImpl { //We may discard: //- htlc update there as failure-trigger tx (revoked commitment tx, non-revoked commitment tx, HTLC-timeout tx) has been disconnected //- maturing spendable output has transaction paying us has been disconnected - self.onchain_events_waiting_threshold_conf.retain(|ref entry| entry.height < height); + self.onchain_events_awaiting_threshold_conf.retain(|ref entry| entry.height < height); self.onchain_tx_handler.block_disconnected(height, broadcaster, fee_estimator, logger); @@ -2350,7 +2350,7 @@ impl ChannelMonitorImpl { F::Target: FeeEstimator, L::Target: Logger, { - self.onchain_events_waiting_threshold_conf.retain(|ref entry| entry.txid != *txid); + self.onchain_events_awaiting_threshold_conf.retain(|ref entry| entry.txid != *txid); self.onchain_tx_handler.transaction_unconfirmed(txid, broadcaster, fee_estimator, logger); } @@ -2579,7 +2579,7 @@ impl ChannelMonitorImpl { })); } } else { - self.onchain_events_waiting_threshold_conf.retain(|ref entry| { + self.onchain_events_awaiting_threshold_conf.retain(|ref entry| { if entry.height != height { return true; } match entry.event { OnchainEvent::HTLCUpdate { ref htlc_update } => { @@ -2594,7 +2594,7 @@ impl ChannelMonitorImpl { event: OnchainEvent::HTLCUpdate { htlc_update: (source, payment_hash) }, }; log_info!(logger, "Failing HTLC with payment_hash {} timeout by a spend tx, waiting for confirmation (at height{})", log_bytes!(payment_hash.0), entry.confirmation_threshold()); - self.onchain_events_waiting_threshold_conf.push(entry); + self.onchain_events_awaiting_threshold_conf.push(entry); } } } @@ -2659,7 +2659,7 @@ impl ChannelMonitorImpl { event: OnchainEvent::MaturingOutput { descriptor: spendable_output.clone() }, }; log_trace!(logger, "Maturing {} until {}", log_spendable!(spendable_output), entry.confirmation_threshold()); - self.onchain_events_waiting_threshold_conf.push(entry); + self.onchain_events_awaiting_threshold_conf.push(entry); } } } @@ -2925,7 +2925,7 @@ impl<'a, Signer: Sign, K: KeysInterface> ReadableArgs<&'a K> let best_block = BestBlock::new(Readable::read(reader)?, Readable::read(reader)?); let waiting_threshold_conf_len: u64 = Readable::read(reader)?; - let mut onchain_events_waiting_threshold_conf = Vec::with_capacity(cmp::min(waiting_threshold_conf_len as usize, MAX_ALLOC_SIZE / 128)); + let mut onchain_events_awaiting_threshold_conf = Vec::with_capacity(cmp::min(waiting_threshold_conf_len as usize, MAX_ALLOC_SIZE / 128)); for _ in 0..waiting_threshold_conf_len { let txid = Readable::read(reader)?; let height = Readable::read(reader)?; @@ -2945,7 +2945,7 @@ impl<'a, Signer: Sign, K: KeysInterface> ReadableArgs<&'a K> }, _ => return Err(DecodeError::InvalidValue), }; - onchain_events_waiting_threshold_conf.push(OnchainEventEntry { txid, height, event }); + onchain_events_awaiting_threshold_conf.push(OnchainEventEntry { txid, height, event }); } let outputs_to_watch_len: u64 = Readable::read(reader)?; @@ -3006,7 +3006,7 @@ impl<'a, Signer: Sign, K: KeysInterface> ReadableArgs<&'a K> pending_monitor_events, pending_events, - onchain_events_waiting_threshold_conf, + onchain_events_awaiting_threshold_conf, outputs_to_watch, onchain_tx_handler, diff --git a/lightning/src/ln/onchaintx.rs b/lightning/src/ln/onchaintx.rs index 8121136c0..8e531b501 100644 --- a/lightning/src/ln/onchaintx.rs +++ b/lightning/src/ln/onchaintx.rs @@ -301,7 +301,7 @@ pub struct OnchainTxHandler { #[cfg(not(test))] claimable_outpoints: HashMap, - onchain_events_waiting_threshold_conf: Vec, + onchain_events_awaiting_threshold_conf: Vec, latest_height: u32, @@ -338,8 +338,8 @@ impl OnchainTxHandler { claim_and_height.1.write(writer)?; } - writer.write_all(&byte_utils::be64_to_array(self.onchain_events_waiting_threshold_conf.len() as u64))?; - for ref entry in self.onchain_events_waiting_threshold_conf.iter() { + writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?; + for ref entry in self.onchain_events_awaiting_threshold_conf.iter() { entry.txid.write(writer)?; writer.write_all(&byte_utils::be32_to_array(entry.height))?; match entry.event { @@ -396,7 +396,7 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K> for OnchainTxHandler { claimable_outpoints.insert(outpoint, (ancestor_claim_txid, height)); } let waiting_threshold_conf_len: u64 = Readable::read(reader)?; - let mut onchain_events_waiting_threshold_conf = Vec::with_capacity(cmp::min(waiting_threshold_conf_len as usize, MAX_ALLOC_SIZE / 128)); + let mut onchain_events_awaiting_threshold_conf = Vec::with_capacity(cmp::min(waiting_threshold_conf_len as usize, MAX_ALLOC_SIZE / 128)); for _ in 0..waiting_threshold_conf_len { let txid = Readable::read(reader)?; let height = Readable::read(reader)?; @@ -417,7 +417,7 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K> for OnchainTxHandler { } _ => return Err(DecodeError::InvalidValue), }; - onchain_events_waiting_threshold_conf.push(OnchainEventEntry { txid, height, event }); + onchain_events_awaiting_threshold_conf.push(OnchainEventEntry { txid, height, event }); } let latest_height = Readable::read(reader)?; @@ -434,7 +434,7 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K> for OnchainTxHandler { channel_transaction_parameters: channel_parameters, claimable_outpoints, pending_claim_requests, - onchain_events_waiting_threshold_conf, + onchain_events_awaiting_threshold_conf, latest_height, secp_ctx, }) @@ -453,7 +453,7 @@ impl OnchainTxHandler { channel_transaction_parameters: channel_parameters, pending_claim_requests: HashMap::new(), claimable_outpoints: HashMap::new(), - onchain_events_waiting_threshold_conf: Vec::new(), + onchain_events_awaiting_threshold_conf: Vec::new(), latest_height: 0, secp_ctx, @@ -776,8 +776,8 @@ impl OnchainTxHandler { height, event: OnchainEvent::Claim { claim_request: first_claim_txid_height.0.clone() } }; - if !self.onchain_events_waiting_threshold_conf.contains(&entry) { - self.onchain_events_waiting_threshold_conf.push(entry); + if !self.onchain_events_awaiting_threshold_conf.contains(&entry) { + self.onchain_events_awaiting_threshold_conf.push(entry); } } } @@ -816,16 +816,16 @@ impl OnchainTxHandler { height, event: OnchainEvent::ContentiousOutpoint { outpoint, input_material }, }; - if !self.onchain_events_waiting_threshold_conf.contains(&entry) { - self.onchain_events_waiting_threshold_conf.push(entry); + if !self.onchain_events_awaiting_threshold_conf.contains(&entry) { + self.onchain_events_awaiting_threshold_conf.push(entry); } } } // After security delay, either our claim tx got enough confs or outpoint is definetely out of reach - let onchain_events_waiting_threshold_conf = - self.onchain_events_waiting_threshold_conf.drain(..).collect::>(); - for entry in onchain_events_waiting_threshold_conf { + let onchain_events_awaiting_threshold_conf = + self.onchain_events_awaiting_threshold_conf.drain(..).collect::>(); + for entry in onchain_events_awaiting_threshold_conf { if entry.has_reached_confirmation_threshold(height) { match entry.event { OnchainEvent::Claim { claim_request } => { @@ -842,7 +842,7 @@ impl OnchainTxHandler { } } } else { - self.onchain_events_waiting_threshold_conf.push(entry); + self.onchain_events_awaiting_threshold_conf.push(entry); } } @@ -881,7 +881,7 @@ impl OnchainTxHandler { L::Target: Logger, { let mut height = None; - for entry in self.onchain_events_waiting_threshold_conf.iter() { + for entry in self.onchain_events_awaiting_threshold_conf.iter() { if entry.txid == *txid { height = Some(entry.height); break; @@ -899,9 +899,9 @@ impl OnchainTxHandler { L::Target: Logger, { let mut bump_candidates = HashMap::new(); - let onchain_events_waiting_threshold_conf = - self.onchain_events_waiting_threshold_conf.drain(..).collect::>(); - for entry in onchain_events_waiting_threshold_conf { + let onchain_events_awaiting_threshold_conf = + self.onchain_events_awaiting_threshold_conf.drain(..).collect::>(); + for entry in onchain_events_awaiting_threshold_conf { if entry.height >= height { //- our claim tx on a commitment tx output //- resurect outpoint back in its claimable set and regenerate tx @@ -919,7 +919,7 @@ impl OnchainTxHandler { _ => {}, } } else { - self.onchain_events_waiting_threshold_conf.push(entry); + self.onchain_events_awaiting_threshold_conf.push(entry); } } for (_, claim_material) in bump_candidates.iter_mut() { @@ -946,7 +946,7 @@ impl OnchainTxHandler { } pub(crate) fn get_relevant_txids(&self) -> Vec { - let mut txids: Vec = self.onchain_events_waiting_threshold_conf + let mut txids: Vec = self.onchain_events_awaiting_threshold_conf .iter() .map(|entry| entry.txid) .collect(); -- 2.39.5