Merge pull request #1134 from jkczyz/2021-10-payee-arg

Payee abstraction for use in get_route and PaymentPathFailed

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

diff --cc lightning/src/ln/functional_test_utils.rs
index fc57bafdd03c47d10a6e0bfa2f376fe27cae8c48,b45fbd3184c9849320bb1b1c165881e1e7afcf51..fb6c1e489f4d08c711baa366503c664201a5526c
--- 1/lightning/src/ln/functional_test_utils.rs
--- 2/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@@ -14,9 -14,9 +14,9 @@@ use chain::{BestBlock, Confirm, Listen
  use chain::channelmonitor::ChannelMonitor;
  use chain::transaction::OutPoint;
  use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 -use ln::channelmanager::{ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure};
 +use ln::channelmanager::{ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure, PaymentId};
  use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
- use routing::router::{Route, get_route};
+ use routing::router::{Payee, Route, get_route};
  use routing::scorer::Scorer;
  use ln::features::{InitFeatures, InvoiceFeatures};
  use ln::msgs;

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

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