From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Mon, 25 Oct 2021 16:09:06 +0000 (+0000)
Subject: Merge pull request #1134 from jkczyz/2021-10-payee-arg
X-Git-Tag: v0.0.103~10
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ca103491eb2d1ed0ce25e8b46b194898d38a5ab5;p=rust-lightning

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

Payee abstraction for use in get_route and PaymentPathFailed
---

ca103491eb2d1ed0ce25e8b46b194898d38a5ab5
diff --cc lightning/src/ln/functional_test_utils.rs
index fc57bafd,b45fbd31..fb6c1e48
--- a/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;