Skip to content

Commit 9804fe7

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 3decffe commit 9804fe7

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,
@@ -41,11 +40,9 @@ use electrum_client::ElectrumApi;
4140
use rand::distributions::Alphanumeric;
4241
use rand::{thread_rng, Rng};
4342

44-
use log::{LevelFilter, Log};
45-
4643
use std::env;
4744
use std::path::PathBuf;
48-
use std::sync::{Arc, Mutex, RwLock};
45+
use std::sync::{Arc, RwLock};
4946
use std::time::Duration;
5047

5148
macro_rules! expect_event {
@@ -254,70 +251,6 @@ pub(crate) enum TestChainSource<'a> {
254251
BitcoindRpc(&'a BitcoinD),
255252
}
256253

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

312+
let mut fs_config = FilesystemLoggerConfig::default();
313+
fs_config.log_level = Some(LogLevel::Gossip);
314+
builder.set_filesystem_logger(fs_config);
315+
379316
if let Some(seed) = seed_bytes {
380317
builder.set_entropy_seed_bytes(seed).unwrap();
381318
}

0 commit comments

Comments
 (0)