Implement Display for Record

As a preparatory step for unifying test log output.

Author: joostjager

lightning/src/ln/functional_tests.rs

@@ -7336,7 +7336,7 @@ pub fn test_concurrent_monitor_claim() {
 
 	// Copy ChainMonitor to simulate watchtower Alice and update block height her ChannelMonitor timeout HTLC onchain
 	let chain_source = test_utils::TestChainSource::new(Network::Testnet);
-	let logger = test_utils::TestLogger::with_id(format!("node {}", "Alice"));
+	let logger = test_utils::TestLogger::with_id("alice".to_string());
 	let persister = test_utils::TestPersister::new();
 	let alice_broadcaster = test_utils::TestBroadcaster::with_blocks(Arc::new(Mutex::new(
 		nodes[0].blocks.lock().unwrap().clone(),
@@ -7387,7 +7387,7 @@ pub fn test_concurrent_monitor_claim() {
 
 	// Copy ChainMonitor to simulate watchtower Bob and make it receive a commitment update first.
 	let chain_source = test_utils::TestChainSource::new(Network::Testnet);
-	let logger = test_utils::TestLogger::with_id(format!("node {}", "Bob"));
+	let logger = test_utils::TestLogger::with_id("bob".to_string());
 	let persister = test_utils::TestPersister::new();
 	let bob_broadcaster =
 		test_utils::TestBroadcaster::with_blocks(Arc::clone(&alice_broadcaster.blocks));

lightning/src/util/logger.rs

@@ -17,6 +17,7 @@ use bitcoin::secp256k1::PublicKey;
 
 use core::cmp;
 use core::fmt;
+use core::fmt::Display;
 use core::ops::Deref;
 
 use crate::ln::types::ChannelId;
@@ -152,6 +153,13 @@ impl<$($args)?> Record<$($args)?> {
 		}
 	}
 }
+
+impl<$($args)?> Display for Record<$($args)?> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		let context = format!("{} [{}:{}]", self.level, self.module_path, self.line);
+		write!(f, "{:<48} {}", context, self.args)
+	}
+}
 } }
 #[cfg(not(c_bindings))]
 impl_record!('a, );

lightning/src/util/test_utils.rs

@@ -1698,9 +1698,7 @@ impl TestLogger {
 
 impl Logger for TestLogger {
 	fn log(&self, record: Record) {
-		let context =
-			format!("{} {} [{}:{}]", self.id, record.level, record.module_path, record.line);
-		let s = format!("{:<55} {}", context, record.args);
+		let s = format!("{:<6} {}", self.id, record);
 		#[cfg(ldk_bench)]
 		{
 			// When benchmarking, we don't actually want to print logs, but we do want to format