From 6957dac4dee55a0252df837e5ac3b1db87a9a556 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 19 Dec 2021 19:24:59 +0000
Subject: [PATCH] Update to LDK 0.0.104

---
 Cargo.toml  | 12 ++++++------
 src/cli.rs  |  2 +-
 src/disk.rs |  2 +-
 src/main.rs | 23 +++++------------------
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 32f6cf4..c43838a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,12 +8,12 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lightning = { version = "0.0.103" }
-lightning-block-sync = { version = "0.0.103", features = [ "rpc-client" ] }
-lightning-invoice = { version = "0.11.0" }
-lightning-net-tokio = { version = "0.0.103" }
-lightning-persister = { version = "0.0.103" }
-lightning-background-processor = { version = "0.0.103" }
+lightning = { version = "0.0.104" }
+lightning-block-sync = { version = "0.0.104", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.12.0" }
+lightning-net-tokio = { version = "0.0.104" }
+lightning-persister = { version = "0.0.104" }
+lightning-background-processor = { version = "0.0.104" }
 
 base64 = "0.13.0"
 bitcoin = "0.27"
diff --git a/src/cli.rs b/src/cli.rs
index 00eb047..21d23a4 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -13,7 +13,7 @@ use lightning::ln::PaymentHash;
 use lightning::routing::network_graph::NetworkGraph;
 use lightning::routing::router;
 use lightning::routing::router::{Payee, RouteParameters};
-use lightning::routing::scorer::Scorer;
+use lightning::routing::scoring::Scorer;
 use lightning::util::config::{ChannelConfig, ChannelHandshakeLimits, UserConfig};
 use lightning::util::events::EventHandler;
 use lightning_invoice::payment::PaymentError;
diff --git a/src/disk.rs b/src/disk.rs
index 7be070c..b019626 100644
--- a/src/disk.rs
+++ b/src/disk.rs
@@ -3,7 +3,7 @@ use bitcoin::secp256k1::key::PublicKey;
 use bitcoin::BlockHash;
 use chrono::Utc;
 use lightning::routing::network_graph::NetworkGraph;
-use lightning::routing::scorer::Scorer;
+use lightning::routing::scoring::Scorer;
 use lightning::util::logger::{Logger, Record};
 use lightning::util::ser::{Readable, Writeable, Writer};
 use std::collections::HashMap;
diff --git a/src/main.rs b/src/main.rs
index 39237d8..343c2d5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,7 @@ use lightning::ln::channelmanager::{
 use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler, SimpleArcPeerManager};
 use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
-use lightning::routing::scorer::Scorer;
+use lightning::routing::scoring::Scorer;
 use lightning::util::config::UserConfig;
 use lightning::util::events::{Event, PaymentPurpose};
 use lightning::util::ser::ReadableArgs;
@@ -213,26 +213,13 @@ async fn handle_ldk_events(
 				}
 			}
 		}
-		Event::PaymentPathFailed {
-			payment_hash,
-			rejected_by_dest,
-			all_paths_failed,
-			short_channel_id,
-			..
-		} => {
+		Event::PaymentPathSuccessful { .. } => {}
+		Event::PaymentPathFailed { .. } => {}
+		Event::PaymentFailed { payment_hash, .. } => {
 			print!(
-				"\nEVENT: Failed to send payment{} to payment hash {:?}",
-				if *all_paths_failed { "" } else { " along MPP path" },
+				"\nEVENT: Failed to send payment to payment hash {:?}: exhausted payment retry attempts",
 				hex_utils::hex_str(&payment_hash.0)
 			);
-			if let Some(scid) = short_channel_id {
-				print!(" because of failure at channel {}", scid);
-			}
-			if *rejected_by_dest {
-				println!(": re-attempting the payment will not succeed");
-			} else {
-				println!(": exhausted payment retry attempts");
-			}
 			print!("> ");
 			io::stdout().flush().unwrap();
 
-- 
2.30.2