refactor: Move LexeTracingLogger into lexe-ln

Author: MaxFangX

Cargo.lock

@@ -46,5 +46,15 @@ lightning-net-tokio = { version = "0.0.110" }
 
 # Ad hoc error definition, easy error propagation, error chains
 anyhow = "1"
+# Used to hold a Tokio runtime used by the sync fns in the Persister trait impl
+once_cell = "1"
 # A wrapper type for carefully handling secrets
 secrecy = "0.8"
+# Logging
+tracing = "0.1"
+tracing-core = "0.1"
+tracing-subscriber = { version = "0.3", default-features = false, features = [
+    "std",
+    "fmt",
+    "tracing-log",
+] }

lexe-ln/Cargo.toml

@@ -2,3 +2,4 @@
 //! types (usually) defined in LDK.
 
 pub mod keys_manager;
+pub mod logger;

lexe-ln/src/lib.rs

@@ -11,11 +11,11 @@ use common::cli::{
     BitcoindRpcInfo, Network, RunArgs, DEFAULT_BACKEND_URL, DEFAULT_RUNNER_URL,
 };
 use common::rng::SysRng;
+use lexe_ln::logger;
 
 use crate::command::owner;
 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::NodePersister;
 use crate::types::NetworkGraphType;

node/src/lexe/logger.rs renamed to lexe-ln/src/logger.rs

@@ -18,6 +18,7 @@ use common::rng::Crng;
 use common::shutdown::ShutdownChannel;
 use futures::future;
 use lexe_ln::keys_manager::LexeKeysManager;
+use lexe_ln::logger::LexeTracingLogger;
 use lightning::chain;
 use lightning::chain::chainmonitor::ChainMonitor;
 use lightning::chain::keysinterface::KeysInterface;
@@ -38,7 +39,6 @@ use crate::lexe::bitcoind::LexeBitcoind;
 use crate::lexe::channel_manager::{
     LxChannelMonitorUpdate, NodeChannelManager,
 };
-use crate::lexe::logger::LexeTracingLogger;
 use crate::lexe::peer_manager::LexePeerManager;
 use crate::lexe::persister::NodePersister;
 use crate::lexe::sync::SyncedChainListeners;

node/src/command/test/mod.rs

@@ -6,6 +6,7 @@ use bitcoin::BlockHash;
 use common::cli::RunArgs;
 use common::ln::channel::LxOutPoint;
 use lexe_ln::keys_manager::LexeKeysManager;
+use lexe_ln::logger::LexeTracingLogger;
 use lightning::chain::chainmonitor::MonitorUpdateId;
 use lightning::chain::BestBlock;
 use lightning::ln::channelmanager::{
@@ -16,7 +17,6 @@ use lightning::util::config::{
 };
 use tracing::{debug, info};
 
-use crate::lexe::logger::LexeTracingLogger;
 use crate::lexe::peer_manager::{ChannelPeer, LexePeerManager};
 use crate::lexe::persister::NodePersister;
 use crate::types::{

node/src/init.rs

@@ -4,7 +4,6 @@
 pub mod background_processor;
 pub mod bitcoind;
 pub mod channel_manager;
-pub mod logger;
 pub mod peer_manager;
 pub mod persister;
 pub mod sync;

node/src/lexe/channel_manager/mod.rs

@@ -9,14 +9,14 @@ use anyhow::{bail, Context};
 use bitcoin::secp256k1::PublicKey;
 use common::rng::Crng;
 use lexe_ln::keys_manager::LexeKeysManager;
+use lexe_ln::logger::LexeTracingLogger;
 use lightning::chain::keysinterface::{KeysInterface, Recipient};
 use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
 use secrecy::zeroize::Zeroizing;
 use tokio::net::TcpStream;
 use tokio::time;
 
 use crate::lexe::channel_manager::NodeChannelManager;
-use crate::lexe::logger::LexeTracingLogger;
 use crate::types::{P2PGossipSyncType, PeerManagerType};
 
 const CONNECT_TIMEOUT: Duration = Duration::from_secs(5);

node/src/lexe/mod.rs

@@ -11,6 +11,7 @@ use common::enclave::Measurement;
 use common::ln::channel::LxOutPoint;
 use common::shutdown::ShutdownChannel;
 use lexe_ln::keys_manager::LexeKeysManager;
+use lexe_ln::logger::LexeTracingLogger;
 use lightning::chain::chainmonitor::{MonitorUpdateId, Persist};
 use lightning::chain::channelmonitor::ChannelMonitorUpdate;
 use lightning::chain::transaction::OutPoint;
@@ -25,7 +26,6 @@ use tokio::sync::mpsc;
 use tracing::{debug, error};
 
 use crate::lexe::channel_manager::{LxChannelMonitorUpdate, USER_CONFIG};
-use crate::lexe::logger::LexeTracingLogger;
 use crate::lexe::peer_manager::ChannelPeer;
 use crate::types::{
     ApiClientType, BroadcasterType, ChainMonitorType, ChannelManagerType,