Merge pull request #2662 from jkczyz/2023-10-chain-hash
authorvalentinewallace <valentinewallace@users.noreply.github.com>
Tue, 17 Oct 2023 15:05:45 +0000 (11:05 -0400)
committerGitHub <noreply@github.com>
Tue, 17 Oct 2023 15:05:45 +0000 (11:05 -0400)
Use `ChainHash` instead of `BlockHash` as applicable

lightning/src/util/test_utils.rs

index 5e69f76c4b5a1fea0aaf70a128343ede9c7a6784..337dfc063cda3d7254f5625e7390967fde1324ea 100644 (file)
@@ -969,8 +969,10 @@ impl Logger for TestLogger {
        fn log(&self, record: &Record) {
                *self.lines.lock().unwrap().entry((record.module_path.to_string(), format!("{}", record.args))).or_insert(0) += 1;
                if record.level >= self.level {
-                       #[cfg(all(not(ldk_bench), feature = "std"))]
-                       println!("{:<5} {} [{} : {}, {}] {}", record.level.to_string(), self.id, record.module_path, record.file, record.line, record.args);
+                       #[cfg(all(not(ldk_bench), feature = "std"))] {
+                               let pfx = format!("{} {} [{}:{}]", self.id, record.level.to_string(), record.module_path, record.line);
+                               println!("{:<55}{}", pfx, record.args);
+                       }
                }
        }
 }