Skip to content

Commit b927b31

Browse files
committed
test: setup node with filesystem logger at gossip log level
- Remove remnants of TestLogWriter and MockLogger that will be reintroduced in a later PR to add a more structured TestConfig object.
1 parent 6766c60 commit b927b31

File tree

1 file changed

+6
-69
lines changed

1 file changed

+6
-69
lines changed

tests/common/mod.rs

Lines changed: 6 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
#![cfg(any(test, cln_test, vss_test))]
99
#![allow(dead_code)]
1010

11-
use chrono::Utc;
1211
use ldk_node::config::{Config, EsploraSyncConfig};
1312
use ldk_node::io::sqlite_store::SqliteStore;
14-
use ldk_node::logger::{LogLevel, LogRecord, LogWriter};
13+
use ldk_node::logger::LogLevel;
1514
use ldk_node::payment::{PaymentDirection, PaymentKind, PaymentStatus};
1615
use ldk_node::{
1716
Builder, CustomTlvRecord, Event, FilesystemLoggerConfig, LightningBalance, Node, NodeError,
@@ -39,11 +38,9 @@ use electrum_client::ElectrumApi;
3938
use rand::distributions::Alphanumeric;
4039
use rand::{thread_rng, Rng};
4140

42-
use log::{LevelFilter, Log};
43-
4441
use std::env;
4542
use std::path::PathBuf;
46-
use std::sync::{Arc, Mutex, RwLock};
43+
use std::sync::{Arc, RwLock};
4744
use std::time::Duration;
4845

4946
macro_rules! expect_event {
@@ -252,70 +249,6 @@ pub(crate) enum TestChainSource<'a> {
252249
BitcoindRpc(&'a BitcoinD),
253250
}
254251

255-
#[derive(Clone)]
256-
pub(crate) enum TestLogWriter {
257-
File(FilesystemLoggerConfig),
258-
LogFacade(LogLevel),
259-
Custom(Arc<dyn LogWriter + Send + Sync>),
260-
}
261-
262-
/// Simple in-memory mock `log` logger for tests.
263-
pub(crate) struct MockLogger {
264-
logs: Arc<Mutex<Vec<String>>>,
265-
}
266-
267-
impl MockLogger {
268-
pub fn new() -> Self {
269-
Self { logs: Arc::new(Mutex::new(Vec::new())) }
270-
}
271-
272-
pub fn retrieve_logs(&self) -> Vec<String> {
273-
self.logs.lock().unwrap().clone()
274-
}
275-
}
276-
277-
impl Log for MockLogger {
278-
fn log(&self, record: &log::Record) {
279-
let message = format!(
280-
"{} [{}] {}",
281-
Utc::now().format("%Y-%m-%d %H:%M:%S"),
282-
record.level(),
283-
record.args()
284-
);
285-
self.logs.lock().unwrap().push(message);
286-
}
287-
288-
fn enabled(&self, _metadata: &log::Metadata) -> bool {
289-
true
290-
}
291-
292-
fn flush(&self) {}
293-
}
294-
295-
impl LogWriter for MockLogger {
296-
fn log(&self, record: LogRecord) {
297-
let message = format!(
298-
"{} [{}] {}",
299-
Utc::now().format("%Y-%m-%d %H:%M:%S"),
300-
record.level,
301-
record.args
302-
);
303-
self.logs.lock().unwrap().push(message);
304-
}
305-
}
306-
307-
pub(crate) fn init_log_logger(level: LevelFilter) -> Arc<MockLogger> {
308-
let logger = Arc::new(MockLogger::new());
309-
log::set_boxed_logger(Box::new(logger.clone())).unwrap();
310-
log::set_max_level(level);
311-
logger
312-
}
313-
314-
pub(crate) fn init_custom_logger() -> Arc<MockLogger> {
315-
let logger = Arc::new(MockLogger::new());
316-
logger
317-
}
318-
319252
macro_rules! setup_builder {
320253
($builder: ident, $config: expr) => {
321254
#[cfg(feature = "uniffi")]
@@ -374,6 +307,10 @@ pub(crate) fn setup_node(
374307
},
375308
}
376309

310+
let mut fs_config = FilesystemLoggerConfig::default();
311+
fs_config.log_level = Some(LogLevel::Gossip);
312+
builder.set_filesystem_logger(fs_config);
313+
377314
if let Some(seed) = seed_bytes {
378315
builder.set_entropy_seed_bytes(seed).unwrap();
379316
}

0 commit comments

Comments
 (0)