From 3c06926cf21dcca3074ef51506f556b2286c299b Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Wed, 7 Jun 2023 00:04:57 +0200 Subject: [PATCH] refactor: index: use `AbortNode` in fatal error helper Deduplicates code in the `FatalError` template function by using `AbortNode` which does the exact same thing if called without any user message (i.e. without second parameter specified). The template is still kept for ease-of-use w.r.t. not having to call `tfm::format(...)` at the call-side each time, and also to keep the diff minimal. --- src/index/base.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/index/base.cpp b/src/index/base.cpp index 3f91910db21..a713be34801 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -33,11 +33,7 @@ constexpr auto SYNC_LOCATOR_WRITE_INTERVAL{30s}; template static void FatalError(const char* fmt, const Args&... args) { - std::string strMessage = tfm::format(fmt, args...); - SetMiscWarning(Untranslated(strMessage)); - LogPrintf("*** %s\n", strMessage); - InitError(_("A fatal internal error occurred, see debug.log for details")); - StartShutdown(); + AbortNode(tfm::format(fmt, args...)); } CBlockLocator GetLocator(interfaces::Chain& chain, const uint256& block_hash)