Skip to content

Commit fe6c821

Browse files
committed
Remove log level filtering in tests
There's no reason why we should be filtering our logs during tests. It seems mostly like the `TestLogger` was written more as a sample logger than a test logger, but these days we have samples, so we should just drop the filtering and show everything.
1 parent 1b08cf4 commit fe6c821

File tree

3 files changed

+8
-20
lines changed

3 files changed

+8
-20
lines changed

lightning-rapid-gossip-sync/src/processing.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,6 @@ mod tests {
476476
use lightning::ln::msgs::DecodeError;
477477

478478
use lightning::routing::gossip::{NetworkGraph, NodeId};
479-
use lightning::util::logger::Level;
480479
use lightning::util::test_utils::TestLogger;
481480

482481
use crate::processing::STALE_RGS_UPDATE_AGE_LIMIT_SECS;
@@ -534,8 +533,7 @@ mod tests {
534533

535534
#[test]
536535
fn node_data_update_succeeds_with_v2() {
537-
let mut logger = TestLogger::new();
538-
logger.enable(Level::Gossip);
536+
let logger = TestLogger::new();
539537
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
540538

541539
let example_input = vec![
@@ -597,8 +595,7 @@ mod tests {
597595

598596
#[test]
599597
fn node_date_update_succeeds_without_channels() {
600-
let mut logger = TestLogger::new();
601-
logger.enable(Level::Gossip);
598+
let logger = TestLogger::new();
602599
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
603600
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
604601

@@ -626,8 +623,7 @@ mod tests {
626623

627624
#[test]
628625
fn update_ignores_v2_additional_data() {
629-
let mut logger = TestLogger::new();
630-
logger.enable(Level::Gossip);
626+
let logger = TestLogger::new();
631627
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
632628
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
633629

lightning/src/util/logger.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,7 @@ mod tests {
294294

295295
#[test]
296296
fn test_logging_macros() {
297-
let mut logger = TestLogger::new();
298-
logger.enable(Level::Gossip);
297+
let logger = TestLogger::new();
299298
let logger : Arc<dyn Logger> = Arc::new(logger);
300299
let wrapper = WrapperLog::new(Arc::clone(&logger));
301300
wrapper.call_macros();

lightning/src/util/test_utils.rs

+4-11
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use crate::routing::scoring::{ChannelUsage, ScoreUpdate, ScoreLookUp};
4343
use crate::sync::RwLock;
4444
use crate::util::config::UserConfig;
4545
use crate::util::test_channel_signer::{TestChannelSigner, EnforcementState};
46-
use crate::util::logger::{Logger, Level, Record};
46+
use crate::util::logger::{Logger, Record};
4747
use crate::util::ser::{Readable, ReadableArgs, Writer, Writeable};
4848
use crate::util::persist::KVStore;
4949

@@ -1110,7 +1110,6 @@ impl events::MessageSendEventsProvider for TestRoutingMessageHandler {
11101110
}
11111111

11121112
pub struct TestLogger {
1113-
level: Level,
11141113
pub(crate) id: String,
11151114
pub lines: Mutex<HashMap<(&'static str, String), usize>>,
11161115
pub context: Mutex<HashMap<(&'static str, Option<PublicKey>, Option<ChannelId>), usize>>,
@@ -1122,15 +1121,11 @@ impl TestLogger {
11221121
}
11231122
pub fn with_id(id: String) -> TestLogger {
11241123
TestLogger {
1125-
level: Level::Trace,
11261124
id,
11271125
lines: Mutex::new(new_hash_map()),
11281126
context: Mutex::new(new_hash_map()),
11291127
}
11301128
}
1131-
pub fn enable(&mut self, level: Level) {
1132-
self.level = level;
1133-
}
11341129
pub fn assert_log(&self, module: &str, line: String, count: usize) {
11351130
let log_entries = self.lines.lock().unwrap();
11361131
assert_eq!(log_entries.get(&(module, line)), Some(&count));
@@ -1174,11 +1169,9 @@ impl Logger for TestLogger {
11741169
fn log(&self, record: Record) {
11751170
*self.lines.lock().unwrap().entry((record.module_path, format!("{}", record.args))).or_insert(0) += 1;
11761171
*self.context.lock().unwrap().entry((record.module_path, record.peer_id, record.channel_id)).or_insert(0) += 1;
1177-
if record.level >= self.level {
1178-
#[cfg(all(not(ldk_bench), feature = "std"))] {
1179-
let pfx = format!("{} {} [{}:{}]", self.id, record.level.to_string(), record.module_path, record.line);
1180-
println!("{:<55}{}", pfx, record.args);
1181-
}
1172+
#[cfg(all(not(ldk_bench), feature = "std"))] {
1173+
let pfx = format!("{} {} [{}:{}]", self.id, record.level.to_string(), record.module_path, record.line);
1174+
println!("{:<55}{}", pfx, record.args);
11821175
}
11831176
}
11841177
}

0 commit comments

Comments
 (0)