fix(test): adjust logging for uniffi and remove custom logger test

- use uniffi flag for appropriate log objects
- use default filewriter arguments
- remove test for custom logger and the logger
  initialization code

Author: enigbe

tests/common/logging.rs

@@ -1,9 +1,10 @@
 use chrono::Utc;
-use ldk_node::logger::{LogLevel, LogRecord, LogWriter};
-use log::{
-	Level as LogFacadeLevel, LevelFilter as LogFacadeLevelFilter, Log as LogFacadeLog,
-	Record as LogFacadeRecord,
-};
+#[cfg(not(feature = "uniffi"))]
+use ldk_node::logger::LogRecord;
+use ldk_node::logger::{LogLevel, LogWriter};
+#[cfg(not(feature = "uniffi"))]
+use log::Record as LogFacadeRecord;
+use log::{Level as LogFacadeLevel, LevelFilter as LogFacadeLevelFilter, Log as LogFacadeLog};
 use std::sync::{Arc, Mutex};
 
 #[derive(Clone)]
@@ -54,13 +55,15 @@ impl LogFacadeLog for MockLogFacadeLogger {
 	fn flush(&self) {}
 }
 
+#[cfg(not(feature = "uniffi"))]
 impl LogWriter for MockLogFacadeLogger {
 	fn log<'a>(&self, record: LogRecord) {
 		let record = MockLogRecord(record).into();
 		LogFacadeLog::log(self, &record);
 	}
 }
 
+#[cfg(not(feature = "uniffi"))]
 struct MockLogRecord<'a>(LogRecord<'a>);
 struct MockLogLevel(LogLevel);
 
@@ -76,6 +79,7 @@ impl From<MockLogLevel> for LogFacadeLevel {
 	}
 }
 
+#[cfg(not(feature = "uniffi"))]
 impl<'a> From<MockLogRecord<'a>> for LogFacadeRecord<'a> {
 	fn from(log_record: MockLogRecord<'a>) -> Self {
 		let log_record = log_record.0;
@@ -84,7 +88,7 @@ impl<'a> From<MockLogRecord<'a>> for LogFacadeRecord<'a> {
 		let mut record_builder = LogFacadeRecord::builder();
 		let record = record_builder
 			.level(level)
-			.module_path(Some(log_record.module_path))
+			.module_path(Some(&log_record.module_path))
 			.line(Some(log_record.line))
 			.args(log_record.args);
 
@@ -100,12 +104,6 @@ pub(crate) fn init_log_logger(level: LogFacadeLevelFilter) -> Arc<MockLogFacadeL
 	logger
 }
 
-pub(crate) fn init_custom_logger() -> Arc<MockLogFacadeLogger> {
-	let logger = Arc::new(MockLogFacadeLogger::new());
-
-	logger
-}
-
 pub(crate) fn validate_log_entry(entry: &String) {
 	let parts = entry.splitn(4, ' ').collect::<Vec<_>>();
 	assert_eq!(parts.len(), 4);

tests/common/mod.rs

@@ -11,9 +11,7 @@ pub(crate) mod logging;
 
 use logging::TestLogWriter;
 
-use ldk_node::config::{
-	Config, EsploraSyncConfig, DEFAULT_LOG_FILENAME, DEFAULT_LOG_LEVEL, DEFAULT_STORAGE_DIR_PATH,
-};
+use ldk_node::config::{Config, EsploraSyncConfig};
 use ldk_node::io::sqlite_store::SqliteStore;
 use ldk_node::payment::{PaymentDirection, PaymentKind, PaymentStatus};
 use ldk_node::{
@@ -328,9 +326,7 @@ pub(crate) fn setup_node(
 
 	match &config.log_writer {
 		TestLogWriter::FileWriter => {
-			let file_path = format!("{}/{}", DEFAULT_STORAGE_DIR_PATH, DEFAULT_LOG_FILENAME);
-			let max_log_level = DEFAULT_LOG_LEVEL;
-			builder.set_filesystem_logger(Some(file_path), Some(max_log_level));
+			builder.set_filesystem_logger(None, None);
 		},
 		TestLogWriter::LogFacade(max_log_level) => {
 			builder.set_log_facade_logger(Some(*max_log_level));

tests/integration_tests_rust.rs

@@ -8,8 +8,11 @@
 mod common;
 
 use common::{
-	do_channel_full_cycle, expect_channel_pending_event, expect_channel_ready_event, expect_event, expect_payment_received_event, expect_payment_successful_event, generate_blocks_and_wait, logging::{init_custom_logger, 
-	init_log_logger, validate_log_entry, TestLogWriter}, open_channel, premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd, setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore
+	do_channel_full_cycle, expect_channel_pending_event, expect_channel_ready_event, expect_event,
+	expect_payment_received_event, expect_payment_successful_event, generate_blocks_and_wait,
+	logging::{init_custom_logger, init_log_logger, validate_log_entry, TestLogWriter},
+	open_channel, premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd,
+	setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
 };
 
 use ldk_node::config::EsploraSyncConfig;
@@ -1163,20 +1166,3 @@ fn facade_logging() {
 		validate_log_entry(entry);
 	}
 }
-
-#[test]
-fn custom_logging() {
-	let (_bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
-	let logger = init_custom_logger();
-	let mut config = random_config(false);
-	config.log_writer = TestLogWriter::Custom(logger.clone());
-
-	println!("== Custom logging starts ==");
-	let _node = setup_node(&chain_source, config, None);
-
-	assert!(!logger.retrieve_logs().is_empty());
-	for (_, entry) in logger.retrieve_logs().iter().enumerate() {
-		validate_log_entry(entry);
-	}
-}