Merge pull request #2059 from wpaulino/broadcast-missing-anchors-event

Queue BackgroundEvent to force close channels upon ChannelManager::read

diff --cc lightning-persister/src/lib.rs
index 3bdf444dd99c1b5d37da31e5c67073e723a48095,01cb4081ccc745d7775b86db079dcf25d49610ec..e6687fef7b8a24a2e6e9cd2cefd8b73f77adbcb4
--- 1/lightning-persister/src/lib.rs
--- 2/lightning-persister/src/lib.rs
+++ b/lightning-persister/src/lib.rs
@@@ -141,10 -141,11 +141,11 @@@ mod tests 
        use bitcoin::{Txid, TxMerkleNode};
        use lightning::chain::ChannelMonitorUpdateStatus;
        use lightning::chain::chainmonitor::Persist;
+       use lightning::chain::channelmonitor::CLOSED_CHANNEL_UPDATE_ID;
        use lightning::chain::transaction::OutPoint;
        use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
 +      use lightning::events::{ClosureReason, MessageSendEventsProvider};
        use lightning::ln::functional_test_utils::*;
 -      use lightning::util::events::{ClosureReason, MessageSendEventsProvider};
        use lightning::util::test_utils;
        use std::fs;
        use bitcoin::hashes::Hash;

diff --cc lightning/src/chain/channelmonitor.rs
Simple merge

diff --cc lightning/src/ln/channel.rs
index f470469426e206ece9fd81785eaeed6ff1e6644a,ae45f5e8fb61550880ee81336953cd7d9d69c078..f1c5cae25ae8bbfbc84b85640c3367de18aa56c1
--- 1/lightning/src/ln/channel.rs
--- 2/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@@ -33,11 -33,11 +33,11 @@@ use crate::ln::chan_utils
  use crate::ln::onion_utils::HTLCFailReason;
  use crate::chain::BestBlock;
  use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, LowerBoundedFeeEstimator};
- use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, LATENCY_GRACE_PERIOD_BLOCKS};
+ use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, LATENCY_GRACE_PERIOD_BLOCKS, CLOSED_CHANNEL_UPDATE_ID};
  use crate::chain::transaction::{OutPoint, TransactionData};
  use crate::chain::keysinterface::{WriteableEcdsaChannelSigner, EntropySource, ChannelSigner, SignerProvider, NodeSigner, Recipient};
 +use crate::events::ClosureReason;
  use crate::routing::gossip::NodeId;
 -use crate::util::events::ClosureReason;
  use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer, VecWriter};
  use crate::util::logger::Logger;
  use crate::util::errors::APIError;

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

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

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

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

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