fix(test): fix setting log's global logger twice

Author: enigbe

tests/common/mod.rs

@@ -312,13 +312,18 @@ impl LogWriter for MockLogger {
 	}
 }
 
-pub(crate) fn init_mock_logger(level: LevelFilter) -> Arc<MockLogger> {
+pub(crate) fn init_log_logger(level: LevelFilter) -> Arc<MockLogger> {
 	let logger = Arc::new(MockLogger::new());
 	log::set_boxed_logger(Box::new(logger.clone())).unwrap();
 	log::set_max_level(level);
 	logger
 }
 
+pub(crate) fn init_custom_logger() -> Arc<MockLogger> {
+	let logger = Arc::new(MockLogger::new());
+	logger
+}
+
 macro_rules! setup_builder {
 	($builder: ident, $config: expr) => {
 		#[cfg(feature = "uniffi")]

tests/integration_tests_rust.rs

@@ -9,9 +9,10 @@ mod common;
 
 use common::{
 	do_channel_full_cycle, expect_channel_ready_event, expect_event, expect_payment_received_event,
-	expect_payment_successful_event, generate_blocks_and_wait, init_mock_logger, open_channel,
-	premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd, setup_builder,
-	setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestLogWriter, TestSyncStore,
+	expect_payment_successful_event, generate_blocks_and_wait, init_custom_logger, init_log_logger,
+	open_channel, premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd,
+	setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestLogWriter,
+	TestSyncStore,
 };
 
 use ldk_node::config::{EsploraSyncConfig, FilesystemLoggerConfig};
@@ -796,7 +797,7 @@ fn generate_bip21_uri() {
 	let chain_source = TestChainSource::Esplora(&electrsd);
 
 	// Setup custom logger.
-	let mock_logger = init_mock_logger(log::LevelFilter::Trace);
+	let mock_logger = init_custom_logger();
 	let log_writer = TestLogWriter::Custom(mock_logger.clone());
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false, log_writer);
 
@@ -835,7 +836,9 @@ fn generate_bip21_uri() {
 		Err(e) => panic!("Failed to generate URI: {:?}", e),
 	}
 
-	assert!(mock_logger.retrieve_logs().last().unwrap().contains("Invoice created: lnbcrt"));
+	let logs = mock_logger.retrieve_logs();
+	let last_log_entry = logs.last().unwrap();
+	assert!(last_log_entry.contains("[INFO] Invoice created:"));
 }
 
 #[test]
@@ -844,7 +847,7 @@ fn unified_qr_send_receive() {
 	let chain_source = TestChainSource::Esplora(&electrsd);
 
 	// Setup `log` facade logger.
-	let mock_logger = init_mock_logger(log::LevelFilter::Trace);
+	let mock_logger = init_log_logger(log::LevelFilter::Trace);
 	let log_writer = TestLogWriter::LogFacade(LogFacadeLoggerConfig { level: LdkLevel::Trace });
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false, log_writer);