Merge pull request #965 from TheBlueMatt/2021-06-log-cleanups

Cleanup logging

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

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

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

diff --cc lightning/src/ln/channel.rs
index 9c81f797f1499ab3e5024768407fd8787a76da04,06308b01cee0a3c1141ea426b7fcbd07343a2a99..5f5bc51dbb14c3b205847994f238131d2e4c2fbb
--- 1/lightning/src/ln/channel.rs
--- 2/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@@ -1702,10 -1701,9 +1714,10 @@@ impl<Signer: Sign> Channel<Signer> 
                Ok((channel_monitor, self.funding_transaction.as_ref().cloned().unwrap()))
        }
  
-       pub fn funding_locked(&mut self, msg: &msgs::FundingLocked) -> Result<(), ChannelError> {
+       pub fn funding_locked<L: Deref>(&mut self, msg: &msgs::FundingLocked, logger: &L) -> Result<(), ChannelError> where L::Target: Logger {
                if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
 -                      return Err(ChannelError::Close("Peer sent funding_locked when we needed a channel_reestablish".to_owned()));
 +                      self.workaround_lnd_bug_4006 = Some(msg.clone());
 +                      return Err(ChannelError::Ignore("Peer sent funding_locked when we needed a channel_reestablish. The peer is likely lnd, see https://github.com/lightningnetwork/lnd/issues/4006".to_owned()));
                }
  
                let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);

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

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

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

diff --cc lightning/src/routing/network_graph.rs
Simple merge

diff --cc lightning/src/routing/router.rs
Simple merge