Rename types::NetworkGraph to types::Graph

.. as we're about to expose a new `NetworkGraph` wrapper type.

Author: tnull

src/builder.rs

@@ -15,7 +15,7 @@ use crate::payment::store::PaymentStore;
 use crate::peer_store::PeerStore;
 use crate::tx_broadcaster::TransactionBroadcaster;
 use crate::types::{
-	ChainMonitor, ChannelManager, DynStore, GossipSync, KeysManager, MessageRouter, NetworkGraph,
+	ChainMonitor, ChannelManager, DynStore, GossipSync, Graph, KeysManager, MessageRouter,
 	OnionMessenger, PeerManager,
 };
 use crate::wallet::Wallet;
@@ -633,7 +633,7 @@ fn build_with_store_internal(
 			Ok(graph) => Arc::new(graph),
 			Err(e) => {
 				if e.kind() == std::io::ErrorKind::NotFound {
-					Arc::new(NetworkGraph::new(config.network.into(), Arc::clone(&logger)))
+					Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 				} else {
 					return Err(BuildError::ReadFailed);
 				}

src/event.rs

@@ -1,8 +1,6 @@
 use crate::types::{DynStore, Sweeper, Wallet};
 
-use crate::{
-	hex_utils, ChannelManager, Config, Error, NetworkGraph, PeerInfo, PeerStore, UserChannelId,
-};
+use crate::{hex_utils, ChannelManager, Config, Error, Graph, PeerInfo, PeerStore, UserChannelId};
 
 use crate::connection::ConnectionManager;
 
@@ -320,7 +318,7 @@ where
 	channel_manager: Arc<ChannelManager>,
 	connection_manager: Arc<ConnectionManager<L>>,
 	output_sweeper: Arc<Sweeper>,
-	network_graph: Arc<NetworkGraph>,
+	network_graph: Arc<Graph>,
 	payment_store: Arc<PaymentStore<L>>,
 	peer_store: Arc<PeerStore<L>>,
 	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
@@ -335,7 +333,7 @@ where
 	pub fn new(
 		event_queue: Arc<EventQueue<L>>, wallet: Arc<Wallet>, channel_manager: Arc<ChannelManager>,
 		connection_manager: Arc<ConnectionManager<L>>, output_sweeper: Arc<Sweeper>,
-		network_graph: Arc<NetworkGraph>, payment_store: Arc<PaymentStore<L>>,
+		network_graph: Arc<Graph>, payment_store: Arc<PaymentStore<L>>,
 		peer_store: Arc<PeerStore<L>>, runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
 		logger: L, config: Arc<Config>,
 	) -> Self {

src/gossip.rs

@@ -1,5 +1,5 @@
 use crate::logger::{log_trace, FilesystemLogger, Logger};
-use crate::types::{GossipSync, NetworkGraph, P2PGossipSync, RapidGossipSync};
+use crate::types::{GossipSync, Graph, P2PGossipSync, RapidGossipSync};
 use crate::Error;
 
 use lightning::routing::utxo::UtxoLookup;
@@ -20,7 +20,7 @@ pub(crate) enum GossipSource {
 }
 
 impl GossipSource {
-	pub fn new_p2p(network_graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>) -> Self {
+	pub fn new_p2p(network_graph: Arc<Graph>, logger: Arc<FilesystemLogger>) -> Self {
 		let gossip_sync = Arc::new(P2PGossipSync::new(
 			network_graph,
 			None::<Arc<dyn UtxoLookup + Send + Sync>>,
@@ -30,7 +30,7 @@ impl GossipSource {
 	}
 
 	pub fn new_rgs(
-		server_url: String, latest_sync_timestamp: u32, network_graph: Arc<NetworkGraph>,
+		server_url: String, latest_sync_timestamp: u32, network_graph: Arc<Graph>,
 		logger: Arc<FilesystemLogger>,
 	) -> Self {
 		let gossip_sync = Arc::new(RapidGossipSync::new(network_graph, Arc::clone(&logger)));

src/lib.rs

@@ -133,7 +133,7 @@ use payment::store::PaymentStore;
 use payment::{Bolt11Payment, Bolt12Payment, OnchainPayment, PaymentDetails, SpontaneousPayment};
 use peer_store::{PeerInfo, PeerStore};
 use types::{
-	Broadcaster, ChainMonitor, ChannelManager, DynStore, FeeEstimator, KeysManager, NetworkGraph,
+	Broadcaster, ChainMonitor, ChannelManager, DynStore, FeeEstimator, Graph, KeysManager,
 	PeerManager, Router, Scorer, Sweeper, Wallet,
 };
 pub use types::{ChannelDetails, PeerDetails, UserChannelId};
@@ -182,7 +182,7 @@ pub struct Node {
 	peer_manager: Arc<PeerManager>,
 	connection_manager: Arc<ConnectionManager<Arc<FilesystemLogger>>>,
 	keys_manager: Arc<KeysManager>,
-	network_graph: Arc<NetworkGraph>,
+	network_graph: Arc<Graph>,
 	gossip_source: Arc<GossipSource>,
 	liquidity_source: Option<Arc<LiquiditySource<Arc<FilesystemLogger>>>>,
 	kv_store: Arc<DynStore>,

src/types.rs

@@ -80,31 +80,28 @@ pub(crate) type KeysManager = crate::wallet::WalletKeysManager<
 >;
 
 pub(crate) type Router = DefaultRouter<
-	Arc<NetworkGraph>,
+	Arc<Graph>,
 	Arc<FilesystemLogger>,
 	Arc<KeysManager>,
 	Arc<Mutex<Scorer>>,
 	ProbabilisticScoringFeeParameters,
 	Scorer,
 >;
-pub(crate) type Scorer = ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
+pub(crate) type Scorer = ProbabilisticScorer<Arc<Graph>, Arc<FilesystemLogger>>;
 
-pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
+pub(crate) type Graph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
 
 pub(crate) type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
 
-pub(crate) type P2PGossipSync = lightning::routing::gossip::P2PGossipSync<
-	Arc<NetworkGraph>,
-	Arc<UtxoLookup>,
-	Arc<FilesystemLogger>,
->;
+pub(crate) type P2PGossipSync =
+	lightning::routing::gossip::P2PGossipSync<Arc<Graph>, Arc<UtxoLookup>, Arc<FilesystemLogger>>;
 pub(crate) type RapidGossipSync =
-	lightning_rapid_gossip_sync::RapidGossipSync<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
+	lightning_rapid_gossip_sync::RapidGossipSync<Arc<Graph>, Arc<FilesystemLogger>>;
 
 pub(crate) type GossipSync = lightning_background_processor::GossipSync<
 	Arc<P2PGossipSync>,
 	Arc<RapidGossipSync>,
-	Arc<NetworkGraph>,
+	Arc<Graph>,
 	Arc<UtxoLookup>,
 	Arc<FilesystemLogger>,
 >;
@@ -120,7 +117,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
 >;
 
 pub(crate) type MessageRouter = lightning::onion_message::messenger::DefaultMessageRouter<
-	Arc<NetworkGraph>,
+	Arc<Graph>,
 	Arc<FilesystemLogger>,
 	Arc<KeysManager>,
 >;