Rename peer_info -> peer_store

Author: tnull

src/lib.rs

@@ -30,13 +30,13 @@ mod event;
 mod hex;
 mod io;
 mod logger;
-mod peer_info;
+mod peer_store;
 
 use access::LdkLiteChainAccess;
 pub use error::LdkLiteError as Error;
 pub use event::LdkLiteEvent;
 use event::{LdkLiteEventHandler, LdkLiteEventQueue};
-use peer_info::{PeerInfo, PeerInfoStorage};
+use peer_store::{PeerInfo, PeerInfoStorage};
 
 #[allow(unused_imports)]
 use logger::{
@@ -364,10 +364,10 @@ impl LdkLiteBuilder {
 			payment::Retry::Timeout(LDK_PAYMENT_RETRY_TIMEOUT),
 		));
 
-		let peers = if let Ok(mut f) = fs::File::open(format!(
+		let peer_store = if let Ok(mut f) = fs::File::open(format!(
 			"{}/{}",
 			ldk_data_dir.clone(),
-			peer_info::PEER_INFO_PERSISTENCE_KEY
+			peer_store::PEER_INFO_PERSISTENCE_KEY
 		)) {
 			Arc::new(PeerInfoStorage::read(&mut f, Arc::clone(&persister))?)
 		} else {
@@ -391,9 +391,9 @@ impl LdkLiteBuilder {
 			network_graph,
 			scorer,
 			invoice_payer,
-			peers,
 			inbound_payments,
 			outbound_payments,
+			peer_store,
 		})
 	}
 }
@@ -425,9 +425,9 @@ pub struct LdkLite {
 	scorer: Arc<Mutex<Scorer>>,
 	network_graph: Arc<NetworkGraph>,
 	invoice_payer: Arc<InvoicePayer<LdkLiteEventHandler>>,
-	peers: Arc<PeerInfoStorage<FilesystemPersister>>,
 	inbound_payments: Arc<PaymentInfoStorage>,
 	outbound_payments: Arc<PaymentInfoStorage>,
+	peer_store: Arc<PeerInfoStorage<FilesystemPersister>>,
 }
 
 impl LdkLite {
@@ -532,7 +532,7 @@ impl LdkLite {
 		let connect_cm = Arc::clone(&self.channel_manager);
 		let connect_pm = Arc::clone(&self.peer_manager);
 		let connect_logger = Arc::clone(&self.logger);
-		let connect_peers = Arc::clone(&self.peers);
+		let connect_peer_store = Arc::clone(&self.peer_store);
 		let stop_connect = Arc::clone(&stop_networking);
 		tokio_runtime.spawn(async move {
 			let mut interval = tokio::time::interval(Duration::from_secs(1));
@@ -548,7 +548,7 @@ impl LdkLite {
 					.map(|chan| chan.counterparty.node_id)
 					.filter(|id| !pm_peers.contains(id))
 				{
-					for peer_info in connect_peers.peers() {
+					for peer_info in connect_peer_store.peers() {
 						if peer_info.pubkey == node_id {
 							let _ = do_connect_peer(
 								peer_info.pubkey,
@@ -675,7 +675,7 @@ impl LdkLite {
 			Some(user_config),
 		) {
 			Ok(_) => {
-				self.peers.add_peer(peer_info.clone())?;
+				self.peer_store.add_peer(peer_info.clone())?;
 				log_info!(self.logger, "Initiated channel with peer {}. ", peer_info.pubkey);
 				Ok(())
 			}
@@ -690,7 +690,7 @@ impl LdkLite {
 	pub fn close_channel(
 		&self, channel_id: &[u8; 32], counterparty_node_id: &PublicKey,
 	) -> Result<(), Error> {
-		self.peers.remove_peer(counterparty_node_id)?;
+		self.peer_store.remove_peer(counterparty_node_id)?;
 		Ok(self.channel_manager.close_channel(channel_id, counterparty_node_id)?)
 	}
 

src/peer_info.rs src/peer_store.rssrc/peer_info.rs renamed to src/peer_store.rs

@@ -7,7 +7,7 @@ use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 use bitcoin::secp256k1::PublicKey;
 
 use std::convert::TryFrom;
-use std::net::{SocketAddr, IpAddr, ToSocketAddrs};
+use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
 use std::sync::{Arc, RwLock};
 
 /// The peer information will be persisted under this key.