Merge pull request #2035 from TheBlueMatt/2023-02-fix-no-con-discon

Fix (and DRY) the conditionals before calling peer_disconnected

diff --cc fuzz/src/chanmon_consistency.rs
Simple merge

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

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

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

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

diff --cc lightning/src/ln/payment_tests.rs
index 3285cf4d7a5b41de63766f1c92776bd19f01d364,4f51d2f8114118328400dca853207669dafd6b94..9a957e37203799014c6853b6c9ffad93f360e37d
--- 1/lightning/src/ln/payment_tests.rs
--- 2/lightning/src/ln/payment_tests.rs
+++ b/lightning/src/ln/payment_tests.rs
@@@ -612,10 -697,9 +612,10 @@@ fn do_test_completed_payment_not_retrya
        let chan_1_monitor_serialized = get_monitor!(nodes[0], chan_id_3).encode();
        nodes_0_serialized = nodes[0].node.encode();
  
 -      // Ensure that after reload we cannot retry the payment.
 +      // Check that after reload we can send the payment again (though we shouldn't, since it was
 +      // claimed previously).
        reload_node!(nodes[0], test_default_channel_config(), nodes_0_serialized, &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], third_persister, third_new_chain_monitor, third_nodes_0_deserialized);
-       nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
+       nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
  
        reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
  

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

diff --cc lightning/src/onion_message/messenger.rs
Simple merge

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