From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 28 Jun 2023 15:03:27 +0000 (+0000)
Subject: Merge pull request #40 from arik-so/2023-06-0.0.115
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=fe5aa631e341937b320a10214b6981fb40923c81;hp=56a58f214905c8329fb768da6a969d43d0ad7ebe;p=rapid-gossip-sync-server

Merge pull request #40 from arik-so/2023-06-0.0.115

Update lightning to 0.0.115
---

diff --git a/Cargo.toml b/Cargo.toml
index 729c080..61e2f72 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,9 +5,9 @@ edition = "2018"
 
 [dependencies]
 bitcoin = "0.29"
-lightning = { version = "0.0.114" }
-lightning-block-sync = { version = "0.0.114", features=["rest-client"] }
-lightning-net-tokio = { version = "0.0.114" }
+lightning = { version = "0.0.115" }
+lightning-block-sync = { version = "0.0.115", features=["rest-client"] }
+lightning-net-tokio = { version = "0.0.115" }
 tokio = { version = "1.14.1", features = ["full"] }
 tokio-postgres = { version="=0.7.5" }
 futures = "0.3"
diff --git a/src/downloader.rs b/src/downloader.rs
index 9256100..ac11ec7 100644
--- a/src/downloader.rs
+++ b/src/downloader.rs
@@ -1,10 +1,10 @@
 use std::sync::{Arc, RwLock};
 
 use bitcoin::secp256k1::PublicKey;
+use lightning::events::{MessageSendEvent, MessageSendEventsProvider};
 use lightning::ln::features::{InitFeatures, NodeFeatures};
 use lightning::ln::msgs::{ChannelAnnouncement, ChannelUpdate, Init, LightningError, NodeAnnouncement, QueryChannelRange, QueryShortChannelIds, ReplyChannelRange, ReplyShortChannelIdsEnd, RoutingMessageHandler};
 use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
-use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider};
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::error::TrySendError;
 
@@ -88,7 +88,7 @@ impl MessageSendEventsProvider for GossipRouter {
 		let gossip_evs = self.outbound_gossiper.get_and_clear_pending_msg_events();
 		for ev in gossip_evs {
 			match ev {
-				MessageSendEvent::BroadcastChannelAnnouncement { msg, update_msg: None } => {
+				MessageSendEvent::BroadcastChannelAnnouncement { msg, .. } => {
 					self.new_channel_announcement(msg);
 				},
 				MessageSendEvent::BroadcastNodeAnnouncement { .. } => {},