Merge pull request #2319 from valentinewallace/2023-05-forward-less-than-onion

Allow forwarding less than the amount in the onion

diff --cc lightning/src/events/mod.rs
index fa4c86cd0ddea84b6970536455737517756edf52,3fe17475fff490357283b1198e694ff104973f0d..f4c4af7e90ff02bf5cf59c22994a7728ded4fcf5
--- 1/lightning/src/events/mod.rs
--- 2/lightning/src/events/mod.rs
+++ b/lightning/src/events/mod.rs
@@@ -1056,8 -1080,9 +1078,9 @@@ impl MaybeReadable for Event 
                                        let mut payment_preimage = None;
                                        let mut payment_secret = None;
                                        let mut amount_msat = 0;
+                                       let mut counterparty_skimmed_fee_msat_opt = None;
                                        let mut receiver_node_id = None;
 -                                      let mut _user_payment_id = None::<u64>; // For compatibility with 0.0.103 and earlier
 +                                      let mut _user_payment_id = None::<u64>; // Used in 0.0.103 and earlier, no longer written in 0.0.116+.
                                        let mut via_channel_id = None;
                                        let mut claim_deadline = None;
                                        let mut via_user_channel_id = None;

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

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