Merge bitcoin/bitcoin#31616: init,log: Unify block index log line

fanquake · fanquake · commit 528354e213a9 · 2025-01-10T11:27:04.000Z
e04be37 init,log: Unify block index and chainstate loading log line (Lőrinc) Pull request description: The line has been present since the beginning. Removed redundant duration as well since it can be recovered from the timestamps. Example logs before the change: ``` 2025-01-07T11:58:33Z Verification progress: 99% 2025-01-07T11:58:33Z Verification: No coin database inconsistencies in last 6 blocks (18905 transactions) 2025-01-07T11:58:33Z block index 31892ms 2025-01-07T11:58:33Z Setting NODE_NETWORK on non-prune mode ``` ACKs for top commit: maflcko: lgtm ACK e04be37 TheCharlatan: ACK e04be37 danielabrozzoni: tACK e04be37 BrandonOdiwuor: Code Review ACK e04be37 Tree-SHA512: cbe4569a17f56ff23e829b837a083c2f730cc490b47bee3bac12126e2257e0ba9ebe9b4384deb03203a0a60aac3b8d283c5d31a6d0481635ba011ac6e2c61ad1
diff --git a/src/init.cpp b/src/init.cpp
@@ -1245,7 +1245,6 @@ static ChainstateLoadResult InitAndLoadChainstate(
             "", CClientUIInterface::MSG_ERROR);
     };
     uiInterface.InitMessage(_("Loading block index…").translated);
-    const auto load_block_index_start_time{SteadyClock::now()};
     auto catch_exceptions = [](auto&& f) {
         try {
             return f();
@@ -1263,7 +1262,7 @@ static ChainstateLoadResult InitAndLoadChainstate(
         }
         std::tie(status, error) = catch_exceptions([&] { return VerifyLoadedChainstate(chainman, options); });
         if (status == node::ChainstateLoadStatus::SUCCESS) {
-            LogPrintf(" block index %15dms\n", Ticks<std::chrono::milliseconds>(SteadyClock::now() - load_block_index_start_time));
+            LogInfo("Block index and chainstate loaded");
         }
     }
     return {status, error};

Original file line number	Diff line number	Diff line change
`@@ -1245,7 +1245,6 @@ static ChainstateLoadResult InitAndLoadChainstate(`
`1245`	`1245`	`"", CClientUIInterface::MSG_ERROR);`
`1246`	`1246`	`};`
`1247`	`1247`	`uiInterface.InitMessage(_("Loading block index…").translated);`
`1248`		`- const auto load_block_index_start_time{SteadyClock::now()};`
`1249`	`1248`	`auto catch_exceptions = [](auto&& f) {`
`1250`	`1249`	`try {`
`1251`	`1250`	`return f();`
`@@ -1263,7 +1262,7 @@ static ChainstateLoadResult InitAndLoadChainstate(`
`1263`	`1262`	`}`
`1264`	`1263`	`std::tie(status, error) = catch_exceptions([&] { return VerifyLoadedChainstate(chainman, options); });`
`1265`	`1264`	`if (status == node::ChainstateLoadStatus::SUCCESS) {`
`1266`		`- LogPrintf(" block index %15dms\n", Ticks<std::chrono::milliseconds>(SteadyClock::now() - load_block_index_start_time));`
	`1265`	`+ LogInfo("Block index and chainstate loaded");`
`1267`	`1266`	`}`
`1268`	`1267`	`}`
`1269`	`1268`	`return {status, error};`