Merge pull request #1106 from TheBlueMatt/2021-10-no-perm-err-broadcast

Do not broadcast commitment txn on Permanent mon update failure

diff --cc lightning-invoice/src/payment.rs
index ee85fab0b5dbe8081d3b21e367c36125c28ecf92,e8e296294016f4ba8b9eb954e3d0df9f0c68d65f..cadb595e719276e5fb8aa88f74c347b6d185ee57
--- 1/lightning-invoice/src/payment.rs
--- 2/lightning-invoice/src/payment.rs
+++ b/lightning-invoice/src/payment.rs
@@@ -1695,9 -1731,9 +1695,9 @@@ mod tests 
                invoice_payer.pay_invoice(&invoice_to_pay).unwrap();
                let inflight_map = invoice_payer.create_inflight_map();
  
-               // Only the second path, which failed with `MonitorUpdateFailed` should be added to our
+               // Only the second path, which failed with `MonitorUpdateInProgress` should be added to our
                // inflight map because retries are disabled.
 -              assert_eq!(inflight_map.len(), 2);
 +              assert_eq!(inflight_map.0.len(), 2);
        }
  
        #[test]

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