node: LexePersister -> NodePersister

Author: MaxFangX

node/src/command/test/mod.rs

@@ -17,7 +17,7 @@ use crate::init::LexeNode;
 use crate::lexe::channel_manager::NodeChannelManager;
 use crate::lexe::logger;
 use crate::lexe::peer_manager::{ChannelPeer, LexePeerManager};
-use crate::lexe::persister::LexePersister;
+use crate::lexe::persister::NodePersister;
 use crate::types::NetworkGraphType;
 
 /// Helper to return a default RunArgs struct for testing.
@@ -126,7 +126,7 @@ impl CommandTestHarness {
         self.node.peer_manager.clone()
     }
 
-    fn persister(&self) -> LexePersister {
+    fn persister(&self) -> NodePersister {
         self.node.persister.clone()
     }
 

node/src/init.rs

@@ -40,7 +40,7 @@ use crate::lexe::channel_manager::{
 };
 use crate::lexe::logger::LexeTracingLogger;
 use crate::lexe::peer_manager::LexePeerManager;
-use crate::lexe::persister::LexePersister;
+use crate::lexe::persister::NodePersister;
 use crate::lexe::sync::SyncedChainListeners;
 use crate::types::{
     ApiClientType, BlockSourceType, BroadcasterType, ChainMonitorType,
@@ -67,7 +67,7 @@ pub struct LexeNode {
     pub channel_manager: NodeChannelManager,
     pub peer_manager: LexePeerManager,
     pub keys_manager: LexeKeysManager,
-    pub persister: LexePersister,
+    pub persister: NodePersister,
     chain_monitor: Arc<ChainMonitorType>,
     pub network_graph: Arc<NetworkGraphType>,
     invoice_payer: Arc<InvoicePayerType>,
@@ -153,7 +153,7 @@ impl LexeNode {
             mpsc::channel(DEFAULT_CHANNEL_SIZE);
 
         // Initialize Persister
-        let persister = LexePersister::new(
+        let persister = NodePersister::new(
             api.clone(),
             node_pk,
             measurement,
@@ -554,7 +554,7 @@ async fn fetch_provisioned_secrets(
 
 /// Initializes the ChannelMonitors
 async fn channel_monitors(
-    persister: &LexePersister,
+    persister: &NodePersister,
     keys_manager: LexeKeysManager,
 ) -> anyhow::Result<Vec<(BlockHash, ChannelMonitorType)>> {
     debug!("reading channel monitors from DB");
@@ -567,7 +567,7 @@ async fn channel_monitors(
 /// Initializes a GossipSync and NetworkGraph
 async fn gossip_sync(
     network: Network,
-    persister: &LexePersister,
+    persister: &NodePersister,
     logger: LexeTracingLogger,
 ) -> anyhow::Result<(Arc<NetworkGraphType>, Arc<P2PGossipSyncType>)> {
     debug!("initializing gossip sync and network graph");
@@ -667,7 +667,7 @@ async fn spawn_p2p_listener(
 fn spawn_p2p_reconnector(
     channel_manager: NodeChannelManager,
     peer_manager: LexePeerManager,
-    persister: LexePersister,
+    persister: NodePersister,
     shutdown: ShutdownChannel,
 ) -> LxTask<()> {
     LxTask::spawn(async move {

node/src/lexe/background_processor.rs

@@ -9,7 +9,7 @@ use tracing::{debug, error, info, trace, warn};
 
 use crate::lexe::channel_manager::NodeChannelManager;
 use crate::lexe::peer_manager::LexePeerManager;
-use crate::lexe::persister::LexePersister;
+use crate::lexe::persister::NodePersister;
 use crate::types::{
     ChainMonitorType, InvoicePayerType, LxTask, P2PGossipSyncType,
     ProbabilisticScorerType,
@@ -33,7 +33,7 @@ impl LexeBackgroundProcessor {
     pub fn start(
         channel_manager: NodeChannelManager,
         peer_manager: LexePeerManager,
-        persister: LexePersister,
+        persister: NodePersister,
         chain_monitor: Arc<ChainMonitorType>,
         event_handler: Arc<InvoicePayerType>,
         gossip_sync: Arc<P2PGossipSyncType>,

node/src/lexe/channel_manager/mod.rs

@@ -18,7 +18,7 @@ use tracing::{debug, info};
 
 use crate::lexe::logger::LexeTracingLogger;
 use crate::lexe::peer_manager::{ChannelPeer, LexePeerManager};
-use crate::lexe::persister::LexePersister;
+use crate::lexe::persister::NodePersister;
 use crate::types::{
     BlockSourceType, BroadcasterType, ChainMonitorType, ChannelManagerType,
     ChannelMonitorType, FeeEstimatorType,
@@ -136,7 +136,7 @@ impl NodeChannelManager {
     #[allow(clippy::too_many_arguments)]
     pub async fn init(
         args: &RunArgs,
-        persister: &LexePersister,
+        persister: &NodePersister,
         block_source: &BlockSourceType,
         restarting_node: &mut bool,
         channel_monitors: &mut [(BlockHash, ChannelMonitorType)],
@@ -201,7 +201,7 @@ impl NodeChannelManager {
     pub async fn open_channel(
         &self,
         peer_manager: &LexePeerManager,
-        persister: &LexePersister,
+        persister: &NodePersister,
         channel_peer: ChannelPeer,
         channel_value_sat: u64,
     ) -> anyhow::Result<()> {

node/src/lexe/persister.rs

@@ -48,11 +48,11 @@ const DEFAULT_RETRIES: usize = 3;
 
 /// An Arc is held internally, so it is fine to clone and use directly.
 #[derive(Clone)] // TODO Try removing this
-pub struct LexePersister {
+pub struct NodePersister {
     inner: InnerPersister,
 }
 
-impl LexePersister {
+impl NodePersister {
     pub fn new(
         api: ApiClientType,
         node_pk: PublicKey,
@@ -72,15 +72,15 @@ impl LexePersister {
     }
 }
 
-impl Deref for LexePersister {
+impl Deref for NodePersister {
     type Target = InnerPersister;
     fn deref(&self) -> &Self::Target {
         &self.inner
     }
 }
 
 /// The thing that actually impls the Persist trait. LDK requires that
-/// LexePersister Derefs to it.
+/// NodePersister Derefs to it.
 #[derive(Clone)]
 pub struct InnerPersister {
     api: ApiClientType,

node/src/repl.rs

@@ -22,7 +22,7 @@ use lightning_invoice::{utils, Currency, Invoice};
 
 use crate::lexe::channel_manager::NodeChannelManager;
 use crate::lexe::peer_manager::{ChannelPeer, LexePeerManager};
-use crate::lexe::persister::LexePersister;
+use crate::lexe::persister::NodePersister;
 use crate::types::{
     HTLCStatus, InvoicePayerType, MillisatAmount, NetworkGraphType,
     PaymentInfo, PaymentInfoStorageType,
@@ -37,7 +37,7 @@ pub async fn poll_for_user_input(
     network_graph: Arc<NetworkGraphType>,
     inbound_payments: PaymentInfoStorageType,
     outbound_payments: PaymentInfoStorageType,
-    persister: LexePersister,
+    persister: NodePersister,
     network: Network,
 ) {
     println!("LDK startup successful. To view available commands: \"help\".");
@@ -600,7 +600,7 @@ async fn open_channel<'a, I: Iterator<Item = &'a str>>(
     mut words: I,
     channel_manager: &NodeChannelManager,
     peer_manager: &LexePeerManager,
-    persister: &LexePersister,
+    persister: &NodePersister,
 ) -> anyhow::Result<()> {
     let peer_pk_at_addr = words
         .next()

node/src/types/alias.rs

@@ -19,7 +19,7 @@ use crate::event_handler::LdkEventHandler;
 use crate::lexe::bitcoind::LexeBitcoind;
 use crate::lexe::channel_manager::NodeChannelManager;
 use crate::lexe::logger::LexeTracingLogger;
-use crate::lexe::persister::LexePersister;
+use crate::lexe::persister::NodePersister;
 use crate::types::PaymentInfo;
 
 pub type PaymentInfoStorageType = Arc<Mutex<HashMap<PaymentHash, PaymentInfo>>>;
@@ -32,7 +32,7 @@ pub type ChainMonitorType = ChainMonitor<
     Arc<BroadcasterType>,
     Arc<FeeEstimatorType>,
     LexeTracingLogger,
-    LexePersister,
+    NodePersister,
 >;
 
 pub type PeerManagerType = PeerManager<