Merge pull request #2957 from G8XSU/pause-events

Don't pause events for chainsync persistence

diff --cc lightning/src/chain/chainmonitor.rs
index ccb30e132c2c0f6e3a072149a6972eaf59e0a2e9,c68e9a7169ed0dba83ea5e03395a7dab70c4df59..257f1d0f30bc1db9840b0e2f2da55aa686beef08
--- 1/lightning/src/chain/chainmonitor.rs
--- 2/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};

diff --cc lightning/src/ln/payment_tests.rs
Simple merge

diff --cc lightning/src/util/test_utils.rs
Simple merge