From: Matt Corallo <git@bluematt.me>
Date: Sun, 16 Jul 2023 03:23:34 +0000 (+0000)
Subject: Upgrade to LDK 0.0.116-alpha1
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=70254ead666a664e3cb68206394f387a4f97e463;p=rapid-gossip-sync-server

Upgrade to LDK 0.0.116-alpha1

This includes a fix for the deadlock in #32.
---

diff --git a/Cargo.toml b/Cargo.toml
index afcfbe7..c662165 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,9 +5,9 @@ edition = "2021"
 
 [dependencies]
 bitcoin = "0.29"
-lightning = { version = "0.0.115" }
-lightning-block-sync = { version = "0.0.115", features=["rest-client"] }
-lightning-net-tokio = { version = "0.0.115" }
+lightning = { version = "0.0.116-alpha1" }
+lightning-block-sync = { version = "0.0.116-alpha1", features=["rest-client"] }
+lightning-net-tokio = { version = "0.0.116-alpha1" }
 tokio = { version = "1.25", features = ["full"] }
 tokio-postgres = { version="=0.7.5" }
 futures = "0.3"
diff --git a/src/tracking.rs b/src/tracking.rs
index 2435907..8d2668f 100644
--- a/src/tracking.rs
+++ b/src/tracking.rs
@@ -11,7 +11,7 @@ use lightning::ln::peer_handler::{
 	ErroringMessageHandler, IgnoringMessageHandler, MessageHandler, PeerManager,
 };
 use lightning::routing::gossip::NetworkGraph;
-use lightning::chain::keysinterface::KeysManager;
+use lightning::sign::KeysManager;
 use tokio::sync::mpsc;
 
 use crate::{config, TestLogger};
@@ -39,13 +39,13 @@ pub(crate) async fn download_gossip(persistence_sender: mpsc::Sender<GossipMessa
 		chan_handler: ErroringMessageHandler::new(),
 		route_handler: Arc::clone(&router),
 		onion_message_handler: IgnoringMessageHandler {},
+		custom_message_handler: IgnoringMessageHandler {},
 	};
 	let peer_handler = Arc::new(PeerManager::new(
 		message_handler,
 		0xdeadbeef,
 		&random_data,
 		TestLogger::new(),
-		IgnoringMessageHandler {},
 		keys_manager,
 	));
 	router.set_pm(Arc::clone(&peer_handler));
diff --git a/src/types.rs b/src/types.rs
index 2d5a281..77a53c4 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 use std::ops::Deref;
 
-use lightning::chain::keysinterface::KeysManager;
+use lightning::sign::KeysManager;
 use lightning::ln::msgs::{ChannelAnnouncement, ChannelUpdate};
 use lightning::ln::peer_handler::{ErroringMessageHandler, IgnoringMessageHandler, PeerManager};
 use lightning::util::logger::{Logger, Record};