From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com> Date: Mon, 6 May 2024 19:08:10 +0000 (-0700) Subject: Merge pull request #2957 from G8XSU/pause-events X-Git-Tag: v0.0.124-beta~133 X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b8d4ac1371bf0db3b28339d4e12fadf02f6add3d;p=rust-lightning Merge pull request #2957 from G8XSU/pause-events Don't pause events for chainsync persistence --- b8d4ac1371bf0db3b28339d4e12fadf02f6add3d diff --cc lightning/src/chain/chainmonitor.rs index ccb30e132,c68e9a716..257f1d0f3 --- a/lightning/src/chain/chainmonitor.rs +++ b/lightning/src/chain/chainmonitor.rs @@@ -29,9 -29,9 +29,9 @@@ use bitcoin::hash_types::{Txid, BlockHa use crate::chain; use crate::chain::{ChannelMonitorUpdateStatus, Filter, WatchedOutput}; use crate::chain::chaininterface::{BroadcasterInterface, FeeEstimator}; - use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Balance, MonitorEvent, TransactionOutputs, WithChannelMonitor, LATENCY_GRACE_PERIOD_BLOCKS}; + use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Balance, MonitorEvent, TransactionOutputs, WithChannelMonitor}; use crate::chain::transaction::{OutPoint, TransactionData}; -use crate::ln::ChannelId; +use crate::ln::types::ChannelId; use crate::sign::ecdsa::WriteableEcdsaChannelSigner; use crate::events; use crate::events::{Event, EventHandler};