diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-04-02 20:49:01 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-04-04 18:08:36 +0200 |
commit | fa91b2b2b3447a3645e7958c7dc4e1946a69cb9c (patch) | |
tree | 58715475a162cc790608a10b3c016ba015201094 | |
parent | fa413f07a14744e7d7f7746e861aabd9cf938f61 (diff) |
move-only: Move AbortNode to shutdown
Can be reviewed with the git option
--color-moved=dimmed-zebra
-rw-r--r-- | src/shutdown.cpp | 14 | ||||
-rw-r--r-- | src/shutdown.h | 5 | ||||
-rw-r--r-- | src/validation.cpp | 13 |
3 files changed, 19 insertions, 13 deletions
diff --git a/src/shutdown.cpp b/src/shutdown.cpp index 2fc195e2d1..35faf3c412 100644 --- a/src/shutdown.cpp +++ b/src/shutdown.cpp @@ -6,7 +6,9 @@ #include <shutdown.h> #include <logging.h> +#include <node/ui_interface.h> #include <util/tokenpipe.h> +#include <warnings.h> #include <config/bitcoin-config.h> @@ -16,6 +18,18 @@ #include <condition_variable> #endif +bool AbortNode(const std::string& strMessage, bilingual_str user_message) +{ + SetMiscWarning(Untranslated(strMessage)); + LogPrintf("*** %s\n", strMessage); + if (user_message.empty()) { + user_message = _("A fatal internal error occurred, see debug.log for details"); + } + AbortError(user_message); + StartShutdown(); + return false; +} + static std::atomic<bool> fRequestShutdown(false); #ifdef WIN32 /** On windows it is possible to simply use a condition variable. */ diff --git a/src/shutdown.h b/src/shutdown.h index b2fbdb8cfb..ff56c6bd87 100644 --- a/src/shutdown.h +++ b/src/shutdown.h @@ -6,6 +6,11 @@ #ifndef BITCOIN_SHUTDOWN_H #define BITCOIN_SHUTDOWN_H +#include <util/translation.h> // For bilingual_str + +/** Abort with a message */ +bool AbortNode(const std::string& strMessage, bilingual_str user_message = bilingual_str{}); + /** Initialize shutdown state. This must be called before using either StartShutdown(), * AbortShutdown() or WaitForShutdown(). Calling ShutdownRequested() is always safe. */ diff --git a/src/validation.cpp b/src/validation.cpp index 19363c0efb..6f184780c8 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1636,19 +1636,6 @@ bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex* pindex) return true; } -/** Abort with a message */ -static bool AbortNode(const std::string& strMessage, bilingual_str user_message = bilingual_str()) -{ - SetMiscWarning(Untranslated(strMessage)); - LogPrintf("*** %s\n", strMessage); - if (user_message.empty()) { - user_message = _("A fatal internal error occurred, see debug.log for details"); - } - AbortError(user_message); - StartShutdown(); - return false; -} - static bool AbortNode(BlockValidationState& state, const std::string& strMessage, const bilingual_str& userMessage = bilingual_str()) { AbortNode(strMessage, userMessage); |