refactor: LexePeerManager -> NodePeerManager

Author: MaxFangX

node/src/command/owner.rs

@@ -5,12 +5,12 @@ use common::api::node::{ListChannels, NodeInfo};
 use common::ln::channel::LxChannelDetails;
 
 use crate::lexe::channel_manager::NodeChannelManager;
-use crate::lexe::peer_manager::LexePeerManager;
+use crate::lexe::peer_manager::NodePeerManager;
 use crate::types::NetworkGraphType;
 
 pub fn node_info(
     channel_manager: NodeChannelManager,
-    peer_manager: LexePeerManager,
+    peer_manager: NodePeerManager,
 ) -> Result<NodeInfo, NodeApiError> {
     let node_pk = channel_manager.get_our_node_id();
 

node/src/command/server/inject.rs

@@ -9,7 +9,7 @@ use common::shutdown::ShutdownChannel;
 use warp::Filter;
 
 use crate::lexe::channel_manager::NodeChannelManager;
-use crate::lexe::peer_manager::LexePeerManager;
+use crate::lexe::peer_manager::NodePeerManager;
 use crate::types::NetworkGraphType;
 
 /// Injects a [`UserPk`].
@@ -35,8 +35,8 @@ pub fn channel_manager(
 
 /// Injects a peer manager.
 pub fn peer_manager(
-    peer_manager: LexePeerManager,
-) -> impl Filter<Extract = (LexePeerManager,), Error = Infallible> + Clone {
+    peer_manager: NodePeerManager,
+) -> impl Filter<Extract = (NodePeerManager,), Error = Infallible> + Clone {
     warp::any().map(move || peer_manager.clone())
 }
 

node/src/command/server/mod.rs

@@ -21,7 +21,7 @@ use warp::{Filter, Rejection, Reply};
 
 use crate::command::{host, owner};
 use crate::lexe::channel_manager::NodeChannelManager;
-use crate::lexe::peer_manager::LexePeerManager;
+use crate::lexe::peer_manager::NodePeerManager;
 use crate::types::NetworkGraphType;
 
 mod inject;
@@ -32,7 +32,7 @@ mod inject;
 /// [`OwnerNodeRunApi`]: common::api::def::OwnerNodeRunApi
 pub fn owner_routes(
     channel_manager: NodeChannelManager,
-    peer_manager: LexePeerManager,
+    peer_manager: NodePeerManager,
     network_graph: Arc<NetworkGraphType>,
     activity_tx: mpsc::Sender<()>,
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {

node/src/command/test/mod.rs

@@ -16,7 +16,7 @@ use lexe_ln::logger;
 use crate::command::owner;
 use crate::init::LexeNode;
 use crate::lexe::channel_manager::NodeChannelManager;
-use crate::lexe::peer_manager::{ChannelPeer, LexePeerManager};
+use crate::lexe::peer_manager::{ChannelPeer, NodePeerManager};
 use crate::lexe::persister::NodePersister;
 use crate::types::NetworkGraphType;
 
@@ -122,7 +122,7 @@ impl CommandTestHarness {
         self.node.channel_manager.clone()
     }
 
-    fn peer_manager(&self) -> LexePeerManager {
+    fn peer_manager(&self) -> NodePeerManager {
         self.node.peer_manager.clone()
     }
 

node/src/init.rs

@@ -39,7 +39,7 @@ use crate::lexe::bitcoind::LexeBitcoind;
 use crate::lexe::channel_manager::{
     LxChannelMonitorUpdate, NodeChannelManager,
 };
-use crate::lexe::peer_manager::LexePeerManager;
+use crate::lexe::peer_manager::NodePeerManager;
 use crate::lexe::persister::NodePersister;
 use crate::lexe::sync::SyncedChainListeners;
 use crate::types::{
@@ -54,7 +54,6 @@ pub const DEFAULT_CHANNEL_SIZE: usize = 256;
 const P2P_RECONNECT_INTERVAL: Duration = Duration::from_secs(60);
 const SHUTDOWN_JOIN_TIMEOUT: Duration = Duration::from_secs(15);
 
-// TODO: Eventually move this into the `lexe` module once init is cleaned up
 // TODO: Remove once keys_manager, persister, invoice_payer are read in SGX
 #[allow(dead_code)]
 pub struct LexeNode {
@@ -65,7 +64,7 @@ pub struct LexeNode {
 
     // --- Actors --- //
     pub channel_manager: NodeChannelManager,
-    pub peer_manager: LexePeerManager,
+    pub peer_manager: NodePeerManager,
     pub keys_manager: LexeKeysManager,
     pub persister: NodePersister,
     chain_monitor: Arc<ChainMonitorType>,
@@ -215,7 +214,7 @@ impl LexeNode {
         let scorer = Arc::new(Mutex::new(scorer));
 
         // Initialize PeerManager
-        let peer_manager = LexePeerManager::init(
+        let peer_manager = NodePeerManager::init(
             rng,
             &keys_manager,
             channel_manager.clone(),
@@ -593,7 +592,7 @@ async fn gossip_sync(
 /// Sets up a `TcpListener` to listen on 0.0.0.0:<peer_port>, handing off
 /// resultant `TcpStream`s for the `PeerManager` to manage
 async fn spawn_p2p_listener(
-    peer_manager: LexePeerManager,
+    peer_manager: NodePeerManager,
     peer_port_opt: Option<Port>,
     shutdown: ShutdownChannel,
 ) -> (LxTask<()>, Port) {
@@ -666,7 +665,7 @@ async fn spawn_p2p_listener(
 /// Spawns a task that regularly reconnects to the channel peers stored in DB.
 fn spawn_p2p_reconnector(
     channel_manager: NodeChannelManager,
-    peer_manager: LexePeerManager,
+    peer_manager: NodePeerManager,
     persister: NodePersister,
     shutdown: ShutdownChannel,
 ) -> LxTask<()> {

node/src/lexe/background_processor.rs

@@ -8,7 +8,7 @@ use tokio::time::{interval, interval_at, Instant};
 use tracing::{debug, error, info, trace, warn};
 
 use crate::lexe::channel_manager::NodeChannelManager;
-use crate::lexe::peer_manager::LexePeerManager;
+use crate::lexe::peer_manager::NodePeerManager;
 use crate::lexe::persister::NodePersister;
 use crate::types::{
     ChainMonitorType, InvoicePayerType, LxTask, P2PGossipSyncType,
@@ -32,7 +32,7 @@ impl LexeBackgroundProcessor {
     #[allow(clippy::too_many_arguments)]
     pub fn start(
         channel_manager: NodeChannelManager,
-        peer_manager: LexePeerManager,
+        peer_manager: NodePeerManager,
         persister: NodePersister,
         chain_monitor: Arc<ChainMonitorType>,
         event_handler: Arc<InvoicePayerType>,

node/src/lexe/channel_manager/mod.rs

@@ -17,7 +17,7 @@ use lightning::util::config::{
 };
 use tracing::{debug, info};
 
-use crate::lexe::peer_manager::{ChannelPeer, LexePeerManager};
+use crate::lexe::peer_manager::{ChannelPeer, NodePeerManager};
 use crate::lexe::persister::NodePersister;
 use crate::types::{
     BlockSourceType, BroadcasterType, ChainMonitorType, ChannelManagerType,
@@ -200,7 +200,7 @@ impl NodeChannelManager {
     /// peer, creating the channel, and persisting the newly created channel.
     pub async fn open_channel(
         &self,
-        peer_manager: &LexePeerManager,
+        peer_manager: &NodePeerManager,
         persister: &NodePersister,
         channel_peer: ChannelPeer,
         channel_value_sat: u64,

node/src/lexe/peer_manager.rs

@@ -23,16 +23,16 @@ const CONNECT_TIMEOUT: Duration = Duration::from_secs(5);
 
 /// An Arc is held internally, so it is fine to clone directly.
 #[derive(Clone)]
-pub struct LexePeerManager(Arc<PeerManagerType>);
+pub struct NodePeerManager(Arc<PeerManagerType>);
 
-impl Deref for LexePeerManager {
+impl Deref for NodePeerManager {
     type Target = PeerManagerType;
     fn deref(&self) -> &Self::Target {
         self.0.as_ref()
     }
 }
 
-impl LexePeerManager {
+impl NodePeerManager {
     pub fn init(
         rng: &mut dyn Crng,
         keys_manager: &LexeKeysManager,

node/src/repl.rs

@@ -21,7 +21,7 @@ use lightning_invoice::payment::PaymentError;
 use lightning_invoice::{utils, Currency, Invoice};
 
 use crate::lexe::channel_manager::NodeChannelManager;
-use crate::lexe::peer_manager::{ChannelPeer, LexePeerManager};
+use crate::lexe::peer_manager::{ChannelPeer, NodePeerManager};
 use crate::lexe::persister::NodePersister;
 use crate::types::{
     HTLCStatus, InvoicePayerType, MillisatAmount, NetworkGraphType,
@@ -31,7 +31,7 @@ use crate::types::{
 #[allow(clippy::too_many_arguments)]
 pub async fn poll_for_user_input(
     invoice_payer: Arc<InvoicePayerType>,
-    peer_manager: LexePeerManager,
+    peer_manager: NodePeerManager,
     channel_manager: NodeChannelManager,
     keys_manager: LexeKeysManager,
     network_graph: Arc<NetworkGraphType>,
@@ -329,7 +329,7 @@ fn help() {
 
 fn node_info(
     channel_manager: &NodeChannelManager,
-    peer_manager: &LexePeerManager,
+    peer_manager: &NodePeerManager,
 ) {
     println!("\t{{");
     println!("\t\t node_pk: {}", channel_manager.get_our_node_id());
@@ -345,7 +345,7 @@ fn node_info(
     println!("\t}},");
 }
 
-fn list_peers(peer_manager: LexePeerManager) {
+fn list_peers(peer_manager: NodePeerManager) {
     println!("\t{{");
     for pk in peer_manager.get_peer_node_ids() {
         println!("\t\t pk: {}", pk);
@@ -599,7 +599,7 @@ fn get_invoice(
 async fn open_channel<'a, I: Iterator<Item = &'a str>>(
     mut words: I,
     channel_manager: &NodeChannelManager,
-    peer_manager: &LexePeerManager,
+    peer_manager: &NodePeerManager,
     persister: &NodePersister,
 ) -> anyhow::Result<()> {
     let peer_pk_at_addr = words