Unify test logger output

Now that we have Display implemented on Record, the various
test logger implementations can make use of that.

Author: joostjager

fuzz/src/full_stack.rs

@@ -1608,14 +1608,7 @@ mod tests {
 				.unwrap()
 				.entry((record.module_path.to_string(), format!("{}", record.args)))
 				.or_insert(0) += 1;
-			println!(
-				"{:<5} [{} : {}, {}] {}",
-				record.level.to_string(),
-				record.module_path,
-				record.file,
-				record.line,
-				record.args
-			);
+			println!("{}", record);
 		}
 	}
 

fuzz/src/onion_message.rs

@@ -102,7 +102,11 @@ impl MessageRouter for TestMessageRouter {
 	fn find_path(
 		&self, _sender: PublicKey, _peers: Vec<PublicKey>, destination: Destination,
 	) -> Result<OnionMessagePath, ()> {
-		Ok(OnionMessagePath { intermediate_nodes: vec![], destination, first_node_addresses: vec![] })
+		Ok(OnionMessagePath {
+			intermediate_nodes: vec![],
+			destination,
+			first_node_addresses: vec![],
+		})
 	}
 
 	fn create_blinded_paths<T: secp256k1::Signing + secp256k1::Verification>(
@@ -328,14 +332,7 @@ mod tests {
 			let mut lines_lock = self.lines.lock().unwrap();
 			let key = (record.module_path.to_string(), format!("{}", record.args));
 			*lines_lock.entry(key).or_insert(0) += 1;
-			println!(
-				"{:<5} [{} : {}, {}] {}",
-				record.level.to_string(),
-				record.module_path,
-				record.file,
-				record.line,
-				record.args
-			);
+			println!("{}", record);
 		}
 	}
 

fuzz/src/utils/test_logger.rs

@@ -59,15 +59,6 @@ impl<'a, Out: Output> Write for LockedWriteAdapter<'a, Out> {
 
 impl<Out: Output> Logger for TestLogger<Out> {
 	fn log(&self, record: Record) {
-		write!(
-			LockedWriteAdapter(&self.out),
-			"{:<5} {} [{} : {}] {}\n",
-			record.level.to_string(),
-			self.id,
-			record.module_path,
-			record.line,
-			record.args
-		)
-		.unwrap();
+		write!(LockedWriteAdapter(&self.out), "{:<6} {}", self.id, record).unwrap();
 	}
 }

lightning-dns-resolver/src/lib.rs

@@ -192,7 +192,7 @@ mod test {
 	}
 	impl Logger for TestLogger {
 		fn log(&self, record: lightning::util::logger::Record) {
-			eprintln!("{}: {}", self.node, record.args);
+			eprintln!("{:<8} {}", self.node, record);
 		}
 	}
 	impl Deref for TestLogger {

lightning-net-tokio/src/lib.rs

@@ -629,14 +629,7 @@ mod tests {
 	pub struct TestLogger();
 	impl lightning::util::logger::Logger for TestLogger {
 		fn log(&self, record: lightning::util::logger::Record) {
-			println!(
-				"{:<5} [{} : {}, {}] {}",
-				record.level.to_string(),
-				record.module_path,
-				record.file,
-				record.line,
-				record.args
-			);
+			println!("{}", record);
 		}
 	}