Skip to content

Commit 7976512

Browse files
committed
Move network_graph.rs to gossip.rs
The routing::network_graph module contains a few structs related to p2p gossip. So renaming the module to 'gossip' seems more appropriate.
1 parent e0c60dc commit 7976512

24 files changed

+43
-43
lines changed

fuzz/src/full_stack.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use lightning::ln::channelmanager::{ChainParameters, ChannelManager};
3737
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
3838
use lightning::ln::msgs::DecodeError;
3939
use lightning::ln::script::ShutdownScript;
40-
use lightning::routing::network_graph::{P2PGossipSync, NetworkGraph};
40+
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
4141
use lightning::routing::router::{find_route, PaymentParameters, RouteParameters};
4242
use lightning::routing::scoring::FixedPenaltyScorer;
4343
use lightning::util::config::UserConfig;

fuzz/src/process_network_graph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use utils::test_logger;
55
/// Actual fuzz test, method signature and name are fixed
66
fn do_test(data: &[u8]) {
77
let block_hash = bitcoin::BlockHash::default();
8-
let network_graph = lightning::routing::network_graph::NetworkGraph::new(block_hash);
8+
let network_graph = lightning::routing::gossip::NetworkGraph::new(block_hash);
99
let rapid_sync = RapidGossipSync::new(&network_graph);
1010
let _ = rapid_sync.update_network_graph(data);
1111
}

fuzz/src/router.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ use lightning::chain::transaction::OutPoint;
1616
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
1717
use lightning::ln::features::InitFeatures;
1818
use lightning::ln::msgs;
19+
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
1920
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
2021
use lightning::routing::scoring::FixedPenaltyScorer;
2122
use lightning::util::logger::Logger;
2223
use lightning::util::ser::Readable;
23-
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
2424

2525
use bitcoin::hashes::Hash;
2626
use bitcoin::secp256k1::PublicKey;

lightning-background-processor/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use lightning::chain::keysinterface::{Sign, KeysInterface};
1818
use lightning::ln::channelmanager::ChannelManager;
1919
use lightning::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
2020
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
21-
use lightning::routing::network_graph::{NetworkGraph, P2PGossipSync};
21+
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
2222
use lightning::routing::scoring::WriteableScore;
2323
use lightning::util::events::{Event, EventHandler, EventsProvider};
2424
use lightning::util::logger::Logger;
@@ -162,8 +162,8 @@ impl BackgroundProcessor {
162162
/// [`ChannelManager::write`]: lightning::ln::channelmanager::ChannelManager#impl-Writeable
163163
/// [`Persister::persist_manager`]: lightning::util::persist::Persister::persist_manager
164164
/// [`Persister::persist_graph`]: lightning::util::persist::Persister::persist_graph
165-
/// [`NetworkGraph`]: lightning::routing::network_graph::NetworkGraph
166-
/// [`NetworkGraph::write`]: lightning::routing::network_graph::NetworkGraph#impl-Writeable
165+
/// [`NetworkGraph`]: lightning::routing::gossip::NetworkGraph
166+
/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
167167
pub fn start<
168168
'a,
169169
Signer: 'static + Sign,
@@ -408,7 +408,7 @@ mod tests {
408408
use lightning::ln::features::{ChannelFeatures, InitFeatures};
409409
use lightning::ln::msgs::{ChannelMessageHandler, Init};
410410
use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
411-
use lightning::routing::network_graph::{NetworkGraph, P2PGossipSync};
411+
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
412412
use lightning::util::config::UserConfig;
413413
use lightning::util::events::{Event, MessageSendEventsProvider, MessageSendEvent};
414414
use lightning::util::ser::Writeable;

lightning-invoice/src/de.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use bitcoin_hashes::Hash;
1313
use bitcoin_hashes::sha256;
1414
use crate::prelude::*;
1515
use lightning::ln::PaymentSecret;
16-
use lightning::routing::network_graph::RoutingFees;
16+
use lightning::routing::gossip::RoutingFees;
1717
use lightning::routing::router::{RouteHint, RouteHintHop};
1818

1919
use num_traits::{CheckedAdd, CheckedMul};
@@ -909,7 +909,7 @@ mod test {
909909

910910
#[test]
911911
fn test_parse_route() {
912-
use lightning::routing::network_graph::RoutingFees;
912+
use lightning::routing::gossip::RoutingFees;
913913
use lightning::routing::router::{RouteHint, RouteHintHop};
914914
use ::PrivateRoute;
915915
use bech32::FromBase32;

lightning-invoice/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use bitcoin_hashes::sha256;
4545
use lightning::ln::PaymentSecret;
4646
use lightning::ln::features::InvoiceFeatures;
4747
#[cfg(any(doc, test))]
48-
use lightning::routing::network_graph::RoutingFees;
48+
use lightning::routing::gossip::RoutingFees;
4949
use lightning::routing::router::RouteHint;
5050
use lightning::util::invoice::construct_invoice_preimage;
5151

lightning-invoice/src/payment.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
//! # use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
3939
//! # use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
4040
//! # use lightning::ln::msgs::LightningError;
41-
//! # use lightning::routing::network_graph::NodeId;
41+
//! # use lightning::routing::gossip::NodeId;
4242
//! # use lightning::routing::router::{Route, RouteHop, RouteParameters};
4343
//! # use lightning::routing::scoring::{ChannelUsage, Score};
4444
//! # use lightning::util::events::{Event, EventHandler, EventsProvider};
@@ -602,7 +602,7 @@ mod tests {
602602
use lightning::ln::features::{ChannelFeatures, NodeFeatures, InitFeatures};
603603
use lightning::ln::functional_test_utils::*;
604604
use lightning::ln::msgs::{ChannelMessageHandler, ErrorAction, LightningError};
605-
use lightning::routing::network_graph::NodeId;
605+
use lightning::routing::gossip::NodeId;
606606
use lightning::routing::router::{PaymentParameters, Route, RouteHop};
607607
use lightning::routing::scoring::ChannelUsage;
608608
use lightning::util::test_utils::TestLogger;

lightning-invoice/src/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ use lightning::ln::channelmanager::{ChannelDetails, ChannelManager, PaymentId, P
1515
use lightning::ln::channelmanager::{PhantomRouteHints, MIN_CLTV_EXPIRY_DELTA};
1616
use lightning::ln::inbound_payment::{create, create_from_hash, ExpandedKey};
1717
use lightning::ln::msgs::LightningError;
18-
use lightning::routing::scoring::Score;
19-
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
18+
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
2019
use lightning::routing::router::{Route, RouteHint, RouteHintHop, RouteParameters, find_route};
20+
use lightning::routing::scoring::Score;
2121
use lightning::util::logger::Logger;
2222
use secp256k1::PublicKey;
2323
use core::ops::Deref;

lightning-invoice/tests/ser_de.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use bitcoin_hashes::hex::FromHex;
99
use bitcoin_hashes::{sha256, Hash};
1010
use bech32::u5;
1111
use lightning::ln::PaymentSecret;
12+
use lightning::routing::gossip::RoutingFees;
1213
use lightning::routing::router::{RouteHint, RouteHintHop};
13-
use lightning::routing::network_graph::RoutingFees;
1414
use lightning_invoice::*;
1515
use secp256k1::PublicKey;
1616
use secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

lightning-rapid-gossip-sync/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
//! ```
3030
//! use bitcoin::blockdata::constants::genesis_block;
3131
//! use bitcoin::Network;
32-
//! use lightning::routing::network_graph::NetworkGraph;
32+
//! use lightning::routing::gossip::NetworkGraph;
3333
//! use lightning_rapid_gossip_sync::RapidGossipSync;
3434
//!
3535
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
@@ -62,7 +62,7 @@ use std::fs::File;
6262
use std::ops::Deref;
6363
use std::sync::atomic::{AtomicBool, Ordering};
6464

65-
use lightning::routing::network_graph::NetworkGraph;
65+
use lightning::routing::gossip::NetworkGraph;
6666

6767
use crate::error::GraphSyncError;
6868

@@ -127,7 +127,7 @@ mod tests {
127127
use bitcoin::Network;
128128

129129
use lightning::ln::msgs::DecodeError;
130-
use lightning::routing::network_graph::NetworkGraph;
130+
use lightning::routing::gossip::NetworkGraph;
131131
use crate::RapidGossipSync;
132132

133133
#[test]
@@ -253,7 +253,7 @@ pub mod bench {
253253
use bitcoin::Network;
254254

255255
use lightning::ln::msgs::DecodeError;
256-
use lightning::routing::network_graph::NetworkGraph;
256+
use lightning::routing::gossip::NetworkGraph;
257257

258258
use crate::RapidGossipSync;
259259

lightning-rapid-gossip-sync/src/processing.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use bitcoin::secp256k1::PublicKey;
1010
use lightning::ln::msgs::{
1111
DecodeError, ErrorAction, LightningError, OptionalField, UnsignedChannelUpdate,
1212
};
13-
use lightning::routing::network_graph::NetworkGraph;
13+
use lightning::routing::gossip::NetworkGraph;
1414
use lightning::util::ser::{BigSize, Readable};
1515

1616
use crate::error::GraphSyncError;
@@ -235,7 +235,7 @@ mod tests {
235235
use bitcoin::Network;
236236

237237
use lightning::ln::msgs::DecodeError;
238-
use lightning::routing::network_graph::NetworkGraph;
238+
use lightning::routing::gossip::NetworkGraph;
239239

240240
use crate::error::GraphSyncError;
241241
use crate::RapidGossipSync;

lightning/src/ln/channelmanager.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7567,7 +7567,7 @@ pub mod bench {
75677567
use ln::features::{InitFeatures, InvoiceFeatures};
75687568
use ln::functional_test_utils::*;
75697569
use ln::msgs::{ChannelMessageHandler, Init};
7570-
use routing::network_graph::NetworkGraph;
7570+
use routing::gossip::NetworkGraph;
75717571
use routing::router::{PaymentParameters, get_route};
75727572
use util::test_utils;
75737573
use util::config::UserConfig;

lightning/src/ln/functional_test_utils.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use chain::channelmonitor::ChannelMonitor;
1515
use chain::transaction::OutPoint;
1616
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
1717
use ln::channelmanager::{ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure, PaymentId, MIN_CLTV_EXPIRY_DELTA};
18-
use routing::network_graph::{P2PGossipSync, NetworkGraph};
18+
use routing::gossip::{P2PGossipSync, NetworkGraph};
1919
use routing::router::{PaymentParameters, Route, get_route};
2020
use ln::features::{InitFeatures, InvoiceFeatures};
2121
use ln::msgs;
@@ -1506,13 +1506,13 @@ macro_rules! expect_payment_failed_conditions {
15061506

15071507
if let Some(chan_closed) = $conditions.expected_blamed_chan_closed {
15081508
match network_update {
1509-
&Some($crate::routing::network_graph::NetworkUpdate::ChannelUpdateMessage { ref msg }) if !chan_closed => {
1509+
&Some($crate::routing::gossip::NetworkUpdate::ChannelUpdateMessage { ref msg }) if !chan_closed => {
15101510
if let Some(scid) = $conditions.expected_blamed_scid {
15111511
assert_eq!(msg.contents.short_channel_id, scid);
15121512
}
15131513
assert_eq!(msg.contents.flags & 2, 0);
15141514
},
1515-
&Some($crate::routing::network_graph::NetworkUpdate::ChannelFailure { short_channel_id, is_permanent }) if chan_closed => {
1515+
&Some($crate::routing::gossip::NetworkUpdate::ChannelFailure { short_channel_id, is_permanent }) if chan_closed => {
15161516
if let Some(scid) = $conditions.expected_blamed_scid {
15171517
assert_eq!(short_channel_id, scid);
15181518
}

lightning/src/ln/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
//! call into your [`P2PGossipSync`].
2020
//!
2121
//! [`ChannelManager`]: channelmanager::ChannelManager
22-
//! [`P2PGossipSync`]: crate::routing::network_graph::P2PGossipSync
22+
//! [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync
2323
2424
#[cfg(any(test, feature = "_test_utils"))]
2525
#[macro_use]

lightning/src/ln/onion_route_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use chain::keysinterface::{KeysInterface, Recipient};
1616
use ln::{PaymentHash, PaymentSecret};
1717
use ln::channelmanager::{HTLCForwardInfo, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingHTLCInfo, PendingHTLCRouting};
1818
use ln::onion_utils;
19-
use routing::network_graph::{NetworkUpdate, RoutingFees, NodeId};
19+
use routing::gossip::{NetworkUpdate, RoutingFees, NodeId};
2020
use routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
2121
use ln::features::{InitFeatures, InvoiceFeatures, NodeFeatures};
2222
use ln::msgs;

lightning/src/ln/onion_utils.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use ln::{PaymentHash, PaymentPreimage, PaymentSecret};
1111
use ln::channelmanager::HTLCSource;
1212
use ln::msgs;
1313
use ln::wire::Encode;
14-
use routing::network_graph::NetworkUpdate;
14+
use routing::gossip::NetworkUpdate;
1515
use routing::router::RouteHop;
1616
use util::chacha20::{ChaCha20, ChaChaReader};
1717
use util::errors::{self, APIError};

lightning/src/ln/peer_handler.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ use util::ser::{VecWriter, Writeable, Writer};
2525
use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
2626
use ln::wire;
2727
use ln::wire::Encode;
28+
use routing::gossip::{NetworkGraph, P2PGossipSync};
2829
use util::atomic_counter::AtomicCounter;
2930
use util::events::{MessageSendEvent, MessageSendEventsProvider};
3031
use util::logger::Logger;
31-
use routing::network_graph::{NetworkGraph, P2PGossipSync};
3232

3333
use prelude::*;
3434
use io;
@@ -210,7 +210,7 @@ pub struct MessageHandler<CM: Deref, RM: Deref> where
210210
/// A message handler which handles messages updating our knowledge of the network channel
211211
/// graph. Usually this is just a [`P2PGossipSync`] object or an [`IgnoringMessageHandler`].
212212
///
213-
/// [`P2PGossipSync`]: crate::routing::network_graph::P2PGossipSync
213+
/// [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync
214214
pub route_handler: RM,
215215
}
216216

lightning/src/ln/priv_short_conf_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use chain::{ChannelMonitorUpdateErr, Watch};
1515
use chain::channelmonitor::ChannelMonitor;
1616
use chain::keysinterface::{Recipient, KeysInterface};
1717
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, MIN_CLTV_EXPIRY_DELTA};
18-
use routing::network_graph::RoutingFees;
18+
use routing::gossip::RoutingFees;
1919
use routing::router::{PaymentParameters, RouteHint, RouteHintHop};
2020
use ln::features::{InitFeatures, InvoiceFeatures};
2121
use ln::msgs;

lightning/src/routing/network_graph.rs renamed to lightning/src/routing/gossip.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ mod tests {
16431643
use chain;
16441644
use ln::PaymentHash;
16451645
use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
1646-
use routing::network_graph::{P2PGossipSync, NetworkGraph, NetworkUpdate, MAX_EXCESS_BYTES_FOR_RELAY};
1646+
use routing::gossip::{P2PGossipSync, NetworkGraph, NetworkUpdate, MAX_EXCESS_BYTES_FOR_RELAY};
16471647
use ln::msgs::{Init, OptionalField, RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
16481648
UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate,
16491649
ReplyChannelRange, QueryChannelRange, QueryShortChannelIds, MAX_VALUE_MSAT};

lightning/src/routing/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
//! Structs and impls for receiving messages about the network and storing the topology live here.
1111
12-
pub mod network_graph;
12+
pub mod gossip;
1313
pub mod router;
1414
pub mod scoring;

lightning/src/routing/router.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use bitcoin::secp256k1::PublicKey;
1717
use ln::channelmanager::ChannelDetails;
1818
use ln::features::{ChannelFeatures, InvoiceFeatures, NodeFeatures};
1919
use ln::msgs::{DecodeError, ErrorAction, LightningError, MAX_VALUE_MSAT};
20+
use routing::gossip::{DirectedChannelInfoWithUpdate, EffectiveCapacity, NetworkGraph, ReadOnlyNetworkGraph, NodeId, RoutingFees};
2021
use routing::scoring::{ChannelUsage, Score};
21-
use routing::network_graph::{DirectedChannelInfoWithUpdate, EffectiveCapacity, NetworkGraph, ReadOnlyNetworkGraph, NodeId, RoutingFees};
2222
use util::ser::{Writeable, Readable, Writer};
2323
use util::logger::{Level, Logger};
2424
use util::chacha20::ChaCha20;
@@ -1858,7 +1858,7 @@ fn build_route_from_hops_internal<L: Deref>(
18581858

18591859
#[cfg(test)]
18601860
mod tests {
1861-
use routing::network_graph::{NetworkGraph, P2PGossipSync, NodeId};
1861+
use routing::gossip::{NetworkGraph, P2PGossipSync, NodeId};
18621862
use routing::router::{get_route, build_route_from_hops_internal, add_random_cltv_offset, default_node_features,
18631863
PaymentParameters, Route, RouteHint, RouteHintHop, RouteHop, RoutingFees,
18641864
DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, MAX_PATH_LENGTH_ESTIMATE};

lightning/src/routing/scoring.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! ```
1818
//! # extern crate bitcoin;
1919
//! #
20-
//! # use lightning::routing::network_graph::NetworkGraph;
20+
//! # use lightning::routing::gossip::NetworkGraph;
2121
//! # use lightning::routing::router::{RouteParameters, find_route};
2222
//! # use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
2323
//! # use lightning::chain::keysinterface::{KeysManager, KeysInterface};
@@ -55,7 +55,7 @@
5555
//! [`find_route`]: crate::routing::router::find_route
5656
5757
use ln::msgs::DecodeError;
58-
use routing::network_graph::{EffectiveCapacity, NetworkGraph, NodeId};
58+
use routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId};
5959
use routing::router::RouteHop;
6060
use util::ser::{Readable, ReadableArgs, Writeable, Writer};
6161
use util::logger::Logger;
@@ -1120,9 +1120,9 @@ mod tests {
11201120

11211121
use ln::features::{ChannelFeatures, NodeFeatures};
11221122
use ln::msgs::{ChannelAnnouncement, ChannelUpdate, OptionalField, UnsignedChannelAnnouncement, UnsignedChannelUpdate};
1123-
use routing::scoring::{ChannelUsage, Score};
1124-
use routing::network_graph::{EffectiveCapacity, NetworkGraph, NodeId};
1123+
use routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId};
11251124
use routing::router::RouteHop;
1125+
use routing::scoring::{ChannelUsage, Score};
11261126
use util::ser::{ReadableArgs, Writeable};
11271127
use util::test_utils::TestLogger;
11281128

lightning/src/util/events.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use ln::features::ChannelTypeFeatures;
2121
use ln::msgs;
2222
use ln::msgs::DecodeError;
2323
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
24-
use routing::network_graph::NetworkUpdate;
24+
use routing::gossip::NetworkUpdate;
2525
use util::ser::{BigSize, FixedLengthReader, Writeable, Writer, MaybeReadable, Readable, VecReadWrapper, VecWriteWrapper};
2626
use routing::router::{RouteHop, RouteParameters};
2727

@@ -339,8 +339,8 @@ pub enum Event {
339339
/// Should be applied to the [`NetworkGraph`] so that routing decisions can take into
340340
/// account the update. [`P2PGossipSync`] is capable of doing this.
341341
///
342-
/// [`NetworkGraph`]: crate::routing::network_graph::NetworkGraph
343-
/// [`P2PGossipSync`]: crate::routing::network_graph::P2PGossipSync
342+
/// [`NetworkGraph`]: crate::routing::gossip::NetworkGraph
343+
/// [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync
344344
network_update: Option<NetworkUpdate>,
345345
/// For both single-path and multi-path payments, this is set if all paths of the payment have
346346
/// failed. This will be set to false if (1) this is an MPP payment and (2) other parts of the

lightning/src/util/persist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use bitcoin::hashes::hex::ToHex;
1313
use io::{self};
1414
use routing::scoring::WriteableScore;
1515

16-
use crate::{chain::{keysinterface::{Sign, KeysInterface}, self, transaction::{OutPoint}, chaininterface::{BroadcasterInterface, FeeEstimator}, chainmonitor::{Persist, MonitorUpdateId}, channelmonitor::{ChannelMonitor, ChannelMonitorUpdate}}, ln::channelmanager::ChannelManager, routing::network_graph::NetworkGraph};
16+
use crate::{chain::{keysinterface::{Sign, KeysInterface}, self, transaction::{OutPoint}, chaininterface::{BroadcasterInterface, FeeEstimator}, chainmonitor::{Persist, MonitorUpdateId}, channelmonitor::{ChannelMonitor, ChannelMonitorUpdate}}, ln::channelmanager::ChannelManager, routing::gossip::NetworkGraph};
1717
use super::{logger::Logger, ser::Writeable};
1818

1919
/// Trait for a key-value store for persisting some writeable object at some key

0 commit comments

Comments
 (0)