Merge pull request #2258 from valentinewallace/2023-04-blinded-pathfinding-groundwork-2

Prefactor `PaymentParameters` for blinded recipients

diff --cc lightning-invoice/src/payment.rs
Simple merge

diff --cc lightning-invoice/src/utils.rs
Simple merge

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

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

diff --cc lightning/src/ln/functional_test_utils.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
Simple merge

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

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

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