chore: revert the renaming of LogLevel to LdkLevel

Author: enigbe

bindings/ldk_node.udl

@@ -25,7 +25,7 @@ dictionary EsploraSyncConfig {
 	u64 fee_rate_cache_update_interval_secs;
 };
 
-enum LdkLevel {
+enum LogLevel {
 	"Gossip",
 	"Trace",
 	"Debug",
@@ -36,11 +36,11 @@ enum LdkLevel {
 
 dictionary FilesystemLoggerConfig {
 	string log_file_path;
-	LdkLevel level;
+	LogLevel level;
 };
 
 dictionary LogFacadeLoggerConfig {
-	LdkLevel level;
+	LogLevel level;
 };
 
 interface Builder {
@@ -564,7 +564,7 @@ dictionary NodeAnnouncementInfo {
 };
 
 dictionary LogRecord {
-	LdkLevel level;
+	LogLevel level;
 	string args;
 	string module_path;
 	u32 line;

src/config.rs

@@ -7,7 +7,7 @@
 
 //! Objects for configuring the node.
 
-use crate::logger::LdkLevel;
+use crate::logger::LogLevel;
 use crate::payment::SendingParameters;
 
 use lightning::ln::msgs::SocketAddress;
@@ -30,7 +30,7 @@ const DEFAULT_FEE_RATE_CACHE_UPDATE_INTERVAL_SECS: u64 = 60 * 10;
 const DEFAULT_PROBING_LIQUIDITY_LIMIT_MULTIPLIER: u64 = 3;
 const DEFAULT_ANCHOR_PER_CHANNEL_RESERVE_SATS: u64 = 25_000;
 const DEFAULT_LOG_FILE_PATH: &'static str = "ldk_node.log";
-const DEFAULT_LOG_LEVEL: LdkLevel = LdkLevel::Debug;
+const DEFAULT_LOG_LEVEL: LogLevel = LogLevel::Debug;
 
 // The 'stop gap' parameter used by BDK's wallet sync. This seems to configure the threshold
 // number of derivation indexes after which BDK stops looking for new scripts belonging to the wallet.
@@ -438,14 +438,14 @@ pub struct FilesystemLoggerConfig {
 	/// directory, i.e. [`Config::storage_dir_path`], is preferred.
 	pub log_file_path: String,
 	/// This specifies the log level.
-	pub level: LdkLevel,
+	pub level: LogLevel,
 }
 
 /// Configuration options for logging to the `log` facade.
 #[derive(Debug, Clone)]
 pub struct LogFacadeLoggerConfig {
 	/// This specifies the log level.
-	pub level: LdkLevel,
+	pub level: LogLevel,
 }
 
 impl Default for FilesystemLoggerConfig {

src/lib.rs

@@ -111,7 +111,7 @@ pub use event::Event;
 pub use io::utils::generate_entropy_mnemonic;
 
 pub use config::{FilesystemLoggerConfig, LogFacadeLoggerConfig};
-pub use logger::{LdkLevel, LogRecord, LogWriter};
+pub use logger::{LogLevel, LogRecord, LogWriter};
 
 #[cfg(feature = "uniffi")]
 use uniffi_types::*;

src/logger.rs

@@ -8,7 +8,7 @@
 pub(crate) use lightning::util::logger::{Logger as LdkLogger, Record};
 pub(crate) use lightning::{log_bytes, log_debug, log_error, log_info, log_trace};
 
-pub use lightning::util::logger::Level as LdkLevel;
+pub use lightning::util::logger::Level as LogLevel;
 
 use chrono::Utc;
 use log::{debug, error, info, trace, warn};
@@ -23,7 +23,7 @@ use std::sync::Arc;
 /// file, line to inform on log's source.
 pub struct LogRecord {
 	/// The verbosity level of the message.
-	pub level: LdkLevel,
+	pub level: LogLevel,
 	/// The message body.
 	pub args: String,
 	/// The module path of the message.
@@ -53,12 +53,12 @@ pub trait LogWriter: Send + Sync + Debug {
 #[derive(Debug)]
 pub(crate) struct FilesystemLogger {
 	file_path: String,
-	level: LdkLevel,
+	level: LogLevel,
 }
 
 #[derive(Debug)]
 pub(crate) struct LogFacadeLogger {
-	level: LdkLevel,
+	level: LogLevel,
 }
 
 /// Defines a writer for [`Logger`].
@@ -99,12 +99,12 @@ impl LogWriter for Writer {
 					.expect("Failed to write to log file")
 			},
 			Writer::LogFacadeWriter(log_facade_logger) => match log_facade_logger.level {
-				LdkLevel::Gossip => trace!("{}", log),
-				LdkLevel::Trace => trace!("{}", log),
-				LdkLevel::Debug => debug!("{}", log),
-				LdkLevel::Info => info!("{}", log),
-				LdkLevel::Warn => warn!("{}", log),
-				LdkLevel::Error => error!("{}", log),
+				LogLevel::Gossip => trace!("{}", log),
+				LogLevel::Trace => trace!("{}", log),
+				LogLevel::Debug => debug!("{}", log),
+				LogLevel::Info => info!("{}", log),
+				LogLevel::Warn => warn!("{}", log),
+				LogLevel::Error => error!("{}", log),
 			},
 			Writer::CustomWriter(custom_logger) => custom_logger.log(record),
 		}
@@ -119,7 +119,7 @@ pub(crate) struct Logger {
 impl Logger {
 	/// Creates a new logger with a filesystem writer. The parameters to this function
 	/// are the path to the log file, and the log level.
-	pub fn new_fs_writer(log_file_path: String, level: LdkLevel) -> Result<Self, ()> {
+	pub fn new_fs_writer(log_file_path: String, level: LogLevel) -> Result<Self, ()> {
 		if let Some(parent_dir) = Path::new(&log_file_path).parent() {
 			fs::create_dir_all(parent_dir)
 				.map_err(|e| eprintln!("ERROR: Failed to create log parent directory: {}", e))?;
@@ -137,7 +137,7 @@ impl Logger {
 		Ok(Self { writer: Writer::FileWriter(fs_writer) })
 	}
 
-	pub fn new_log_facade(level: LdkLevel) -> Result<Self, ()> {
+	pub fn new_log_facade(level: LogLevel) -> Result<Self, ()> {
 		let log_facade_writer = LogFacadeLogger { level };
 
 		Ok(Self { writer: Writer::LogFacadeWriter(log_facade_writer) })

tests/integration_tests_rust.rs

@@ -17,7 +17,7 @@ use common::{
 
 use ldk_node::config::{EsploraSyncConfig, FilesystemLoggerConfig};
 use ldk_node::payment::{PaymentKind, QrPaymentResult, SendingParameters};
-use ldk_node::LdkLevel;
+use ldk_node::LogLevel;
 use ldk_node::{Builder, Event, LogFacadeLoggerConfig, NodeError};
 
 use lightning::ln::channelmanager::PaymentId;
@@ -845,7 +845,7 @@ fn unified_qr_send_receive() {
 
 	// Setup `log` facade logger.
 	let mock_logger = init_log_logger(log::LevelFilter::Trace);
-	let log_writer = TestLogWriter::LogFacade(LogFacadeLoggerConfig { level: LdkLevel::Trace });
+	let log_writer = TestLogWriter::LogFacade(LogFacadeLoggerConfig { level: LogLevel::Trace });
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false, log_writer);
 
 	let address_a = node_a.onchain_payment().new_address().unwrap();