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 afcfbe73cca505e116ca01456754b442c7380377..c662165b9690dcb200e2ef4e6f30efbe2535e22b 100644 (file)
--- 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 243590765f1e829e750d6c6dc0cc68b07687a1c1..8d2668fcaf08ffde4128fcb6a68bfb8987e26c76 100644 (file)
--- 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 2d5a281e02024a8ab8c25b74e82684c17dc18d07..77a53c477c907fe6c90c48d8bdd1de31b721fd15 100644 (file)
--- 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};